Merge "adb: fix darwin build break."