GitLab

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

Merge commit '1884d99a'

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