Merge "adb: fix mac build breakage."