Merge "adb: really fix the mac build." am: e82401e592 am: a20ce6cfb5
am: 639f2dbc66

Change-Id: If4716f0a0ca556b6cc1dfa031cd528f6605b8786