Merge "adb: fix mac build" am: ef356fa5bd
am: ada40cd6b8

Change-Id: Iad7ec0b8779fbbfb886c927acd866a55cd89414b