Merge "Switch to prebuilt clang-3217047"