Merge "Tweak comments for OpenJDK 9 build toolchain logic." am: 2655e57bbb am: ea43e16f60
am: c5e4334bb3

Change-Id: I78ef2edd0579ddc3d6ee22e4df929a967e61b86d