Merge "Fix compilation when targeting OpenJDK 9."