Merge "Fix Mac adb build."
am: 8660035010

* commit '8660035010515833c538401a418dfb74427aefc6':
  Fix Mac adb build.