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

* commit '721f189a0571ab51388c8a223f343f3da78f28df':
  fix adb build on Darwin