Merge "adb: fix darwin build." am: 72938f730c am: 53e194d085
am: 7cd1f0fb0a

Change-Id: I80de964da1c97316b321dc6a6204df36a28d26dc