Merge "Make envsetup.sh set JAVA_HOME correctly for java7."