Auto merge of #25157 - jdm:fontconfig-up, r=asajeffrey

Fix intermittent android build error

Incorporates servo/libfontconfig#42.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24715
- [x] There are tests for these changes