Merge "Fix compilation when targeting OpenJDK 9." am: 0d2f465ed7
am: e03a757d87

Change-Id: I4490207298bc72a8fdce6e20d569b30f3843b6c4