am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."

* commit 'f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4':
  Make envsetup.sh set JAVA_HOME correctly for java7.