Merge "adb: fix darwin build break." am: a0661237e1 am: 8016a0aa11
am: 40866ccfc0

Change-Id: I5e3b7fab5bb7c3428a2dfe14ca43a54fb62358b8