Merge pull request #7704 from ScottTodd:llvm-build-fix

PiperOrigin-RevId: 411117155