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

Change-Id: Ib81ad048b1086d577b21c810a9ae24550ff115b3