Merge upstream-jdk #4

Job	Run time
Select platforms	1s
linux-x64 / build (debug)	5m 7s
linux-x64 / build (release)	5m 11s
linux-x64-hs-minimal / build (debug)	5m 8s
docs / build (debug)	3m 50s
linux-cross-compile / build (aarch64)	5m 9s
linux-cross-compile / build (arm)	5m 8s
linux-x64-hs-nopch / build (debug)	5m 9s
linux-x64-hs-optimized / build (debug)	5m 9s
linux-cross-compile / build (s390x)	5m 11s
linux-x64-hs-zero / build (debug)	5m 7s
linux-cross-compile / build (ppc64le)	5m 8s
linux-cross-compile / build (riscv64)	1m 22s
linux-x86 / build (debug)	5m 11s
macos-aarch64 / build (debug)	5m 12s
macos-x64 / build (debug)	5m 18s
linux-x86 / build (release)	5m 10s
macos-aarch64 / build (release)	5m 12s
macos-x64 / build (release)	5m 20s
windows-aarch64 / build (debug)	5m 5s
windows-aarch64 / build (release)	5m 4s
windows-x64 / build (debug)	5m 5s
windows-x64 / build (release)	5m 1s
windows-x64	1s
linux-x64	1s
linux-x86	1s
macos-aarch64	1s
macos-x64	1s
Remove bundle artifacts	3s
	1h 48m 26s

Provide feedback