Merge "adb: really fix the mac build."