Merge "Update to clang-r498229b" into main