am 948206c0: Merge "Fix tools path on Mac OS for java 7."
am 948206c0: Merge "Fix tools path on Mac OS for java 7."

* commit '948206c026c8751b9d53341dfe9c2c2905ebb002':
  Fix tools path on Mac OS for java 7.

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