Merge "Update Clang for rebase to r212749."