Merge "Fix Mac adb build." am: 8660035010
am: 2176a87b8e

* commit '2176a87b8e0bb9509bce3b69433fe1c74330ee87':
  Fix Mac adb build.