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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build