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

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