am b4314b3a: Merge "Move GetAndroidToolsDir to common location."

* commit 'b4314b3aa80f0e6d3a55da7865e80658a150f1e8':
  Move GetAndroidToolsDir to common location.