Merge "adb: fix mac build."