Merge "adb: fix mac build."
am: 925b410c7f

Change-Id: I24661973196be25fb3d031c1b389b34082f6af8a