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

Change-Id: I628c836ce87bde417f7cba64cf4bb20e206bc835