Harden merging of VLAs #26316

Job	Run time
PR formatting / line endings	21s
PR formatting / whitespace	19s
PR formatting / copyright headers	18s
PR formatting / pragma-once	7s
PR formatting / clang-format	38s
	1m 43s

Provide feedback