Merge "adb: fix mac build breakage." am: bd3b16c603 am: 95347b4667
am: 0a2e8e94ae

Change-Id: Ic2966482db39cdb15eacb192606bca44b0fd5f6f