Merge "fix adb build on Darwin"