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

Change-Id: I80de964da1c97316b321dc6a6204df36a28d26dc