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

* commit '48b6a1f346dd7e01eb7d3cca6fce521156402f46':
  Fix Mac adb build.