Merge "adb: fix darwin build."
am: 72938f730c

Change-Id: Ie1509f3660d983c0763ca61b3585c333b66c1ea1