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

* commit '99bb0365d53186c8ece6ac4e61ca2d303d0e0f0a':
  Fix tools path on Mac OS for java 7.