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

Change-Id: I5307e7be5b10ef2ce8c62ef0febd54e287dd9fe4