Merge "Upgrade the default clang version" into main