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

Merge commit 'aee4daacc804bbcd1df551cc2229d12fa5c35c24' into gingerbread-plus-aosp

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