Merge "Update to use the latest clang-2629532."