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

Change-Id: I9155e7010df14da26db4f75c5994379e1539e1a0