Builds in release branch failing.

[boomanaiden154]

The release branch needs the same fixes as #122221.

We should figure out a better strategy to version the CI container in the future so that this doesn't happen. Just versioning based on the LLVM version and pinning the release branches to the release version container probably makes a decent amount of sense, but we will have to see.

[llvmbot]

@llvm/issue-subscribers-infrastructure

Author: Aiden Grossman (boomanaiden154)

The release branch needs the same fixes as #122221.

We should figure out a better strategy to version the CI container in the future so that this doesn't happen. Just versioning based on the LLVM version and pinning the release branches to the release version container probably makes a decent amount of sense, but we will have to see.

[boomanaiden154]

/cherry-pick a759176

[llvmbot]

/pull-request #122814