Merge pull request #19520 from hrydgard/more-fixes #10099

Job	Run time
build-uwp	8m 26s
build_test_headless_alpine	12m 32s
build-windows (x64)	9m 38s
build (ubuntu-latest, test, clang, clang++, ./b.sh --headless --unittest, clang-normal)	4m 14s
build-windows (ARM64)	10m 24s
build (ubuntu-latest, gcc, g++, ./b.sh --headless --unittest, gcc-normal)	3m 21s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=arm64-v8a UNITTE...	9m 29s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=armeabi-v7a UNIT...	6m 16s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=x86_64 UNITTEST=...	9m 39s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=arm64-v8a OPENXR...	9m 42s
build (ubuntu-latest, android, clang, clang++, ./b.sh --libretro_android ppsspp_libretro, android...	4m 4s
build (ubuntu-latest, qt, gcc, g++, ./b.sh --qt, qt)	3m 38s
build (ubuntu-latest, libretro, gcc, g++, make -C libretro -f Makefile -j2, gcc-libretro)	2m 36s
build (ubuntu-latest, libretro, clang, clang++, make -C libretro -f Makefile -j2, clang-libretro)	3m 2s
build (macos-latest, test, clang, clang++, ./b.sh --headless --unittest --fat --no-png --no-sdl2,...	10m 11s
build (macos-latest, ios, clang, clang++, ./b.sh --ios, ios)	3m 30s
test (ubuntu-latest)	57s
test (macos-latest)	44s
test-windows	38s
	1h 53m 1s

Provide feedback