Merge "Revert "Upgrade to clang-r530567"" into main