ldionne wrote: Looks like the CI failures are Android via an out-of-memory issue (which looks like a flake), and the bootstrapping build failure that we need this patch in order to fix. Merging. https://github.com/llvm/llvm-project/pull/96217