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

Change-Id: Ia528e63b14aebcdf0560d05390416a8f4c08a143