Merge "Switch to using clang-3289846."