5531347e56
This upgrade is needed to support JDK9, that was fixed in this
commit: [1].
[1] f04406c1f1
Change-Id: Ic7464964dc7e21946aac4b4a786107a0df51ae2a