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

Change-Id: I066771334a0d7c4d79c4035ccce95c08d7a23892