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

Change-Id: I936b9b5c7d40502852afa7216e9e03a13c6456a5