Merge "Update clang version to clang-r498229" into main