Merge "Tweak comments for OpenJDK 9 build toolchain logic."