am 231a2c99: am 8c159b1f: am b4314b3a: Merge "Move GetAndroidToolsDir to common location."

* commit '231a2c99289063b9afae108e807f60ff75e86dab':
  Move GetAndroidToolsDir to common location.