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

* commit '2cc4fd73d100749f4154065e4884fc912db584a9':
  fix adb build on Darwin