The story so far: - https://github.com/llvm/llvm-project/pull/98200 fixed a bug but caused a new bug. - https://github.com/llvm/llvm-project/pull/113443 largely fixes the issue from 98200 but broke the Android buildbot (https://lab.llvm.org/buildbot/#/builders/186/builds/3642). - Buildbot logs attached for posterity: [Android-problems-yo.txt](https://github.com/user-attachments/files/17739389/Android-problems-yo.txt). - Since Android's toolchain had never seen 98200, https://github.com/llvm/llvm-project/pull/115790 reverts Android to the pre-98200 behavior. However, this means that https://github.com/llvm/llvm-project/issues/113385 is still not fixed for Android.