Merge "Fix tools path on Mac OS for java 7."