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

Change-Id: Iac95663ad50966fbbc26936b58ec22faf7369e22