[Misc] Fix bugs in previous commit. #133

Job	Run time
Prerequisites	45s
Windows x64 (build release)	29m 16s
Windows x64 (build debug)	25m 3s
Linux x64 (build release)	33m 16s
Linux x64 (build debug)	43m 51s
Linux x86 (build release)	7m 12s
Linux x86 (build debug)	10m 6s
macOS x64 (build release)	20m 21s
macOS x64 (build debug)	18m 50s
macOS aarch64 (build release)	22m 5s
macOS aarch64 (build debug)	38m 41s
Linux x86	0s
macOS x64	0s
Windows x64	0s
Linux x64 (jdk/tier1 part 1)	19m 58s
Linux x64 (jdk/tier1 part 2)	20m 47s
Linux x64 (jdk/tier1 part 3)	8m 17s
Linux x64 (langtools/tier1)	39m 30s
Linux x64 (hs/tier1 common)	5m 47s
Linux x64 (hs/tier1 compiler)	51m 25s
Linux x64 (hs/tier1 gc)	40m 54s
Linux x64 (hs/tier1 runtime)	27m 8s
Linux x64 (hs/tier1 serviceability)	15m 13s
Linux additional (hs x64 build only)	28m 35s
Linux additional (hs x64 zero build only)	3m 30s
Linux additional (hs x64 minimal build only)	6m 59s
Linux additional (hs x64 optimized build only)	17m 3s
Linux additional (hs aarch64 build only)	11m 7s
Linux additional (hs arm build only)	9m 50s
Linux additional (hs s390x build only)	11m 19s
Linux additional (hs ppc64le build only)	13m 59s
Post-process artifacts	15s
	9h 41m 2s

Provide feedback