Merge "Switch to prebuilt clang-3016494"