Merge "Switch adb over to clang."