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

Change-Id: If89dd3fa27da4316122802af234b6104c2a8ef58