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

Change-Id: I159bb4720cef0e9cfcb845d76195262f568e94b2