Merge "adb: fix mac build breakage."
am: 52c6f1b6de

Change-Id: I0a38a2bde7fc80d193e3e92e74264d2160f84084