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

* commit '8c159b1f0e84a7d24e72724fca760fe59d14bd48':
  Move GetAndroidToolsDir to common location.