Merge "adb: fix mac build breakage." am: 52c6f1b6de am: 94a23604c7
am: 0a2e8e94ae

Change-Id: Ic2966482db39cdb15eacb192606bca44b0fd5f6f