Merge "adb: fix mac build." am: 925b410c7f
am: d743ebc829

Change-Id: I53ecb37a9351f92ba613a9704dba91b29bb52ab1