am 6ebaf311: am 721f189a: Merge "fix adb build on Darwin"

* commit '6ebaf311a7af8d20979deba279f9d5096ed8f193':
  fix adb build on Darwin