more hipify v2 fixes (#4854) #18824

Job	Run time
build-macos (macos-13, static)	16m 41s
build-bazel (x86, linux.12xlarge, clang)	9m 36s
build-windows (windows-2022, static)	12m 43s
build-bazel (x86, linux.12xlarge, gcc)	10m 9s
build-macos (macos-13, shared)	16m 2s
build-windows (windows-2022, shared)	12m 50s
build-linux (x86, linux.12xlarge, shared, clang, 16.0.6)	19m 54s
build-linux (x86, linux.12xlarge, static, gcc, 9.5.0)	25m 50s
build-linux (x86, linux.12xlarge, static, gcc, 14.1.0)	26m 23s
build-linux (x86, linux.12xlarge, static, clang, 16.0.6)	20m 3s
build-linux (x86, linux.12xlarge, shared, gcc, 14.1.0)	26m 34s
build-linux (x86, linux.12xlarge, shared, gcc, 9.5.0)	25m 44s
build-linux (arm, linux.arm64.m7g.4xlarge, shared, gcc, 14.1.0)	1h 22m 4s
build-linux (arm, linux.arm64.m7g.4xlarge, static, gcc, 14.1.0)	1h 21m 15s
build-linux (arm, linux.arm64.m7g.4xlarge, static, clang, 16.0.6)	32m 55s
build-linux (arm, linux.arm64.m7g.4xlarge, shared, clang, 16.0.6)	32m 53s
	7h 31m 36s

Provide feedback