am 475a3d17: Merge "Use java_home to determine jdk location."

* commit '475a3d17d7594ee2b8bcf1ac826c490b49f116df':
  Use java_home to determine jdk location.