am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.

Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'

* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
  The java version changed, and we made envsetup automatically find the right JAVA_HOME.