Merge "Remove clang-r437112"