[rebranch] Various changes to get rebranch compiling#8938

bnbarham merged 6 commits intoswiftlang:stable/20240625swiftlang/llvm-project:stable/20240625from

bnbarham:get-rebranch-compilingbnbarham/llvm-project:get-rebranch-compilingCopy head branch name to clipboard