Merge "adb: fix darwin build." am: dd87331974
am: 7257f2ad7d

Change-Id: I5307e7be5b10ef2ce8c62ef0febd54e287dd9fe4