improve oneOf handling #12688

Job	Run time
build_ee_312	0s
build	21m 23s
build_ee	16m 2s
build_ee_nsjail	2m 20s
build_ee_full	0s
build_ee_cuda	0s
build_ee_slim	0s
run_integration_test	2m 54s
publish_ecr_s3	1m 53s
build_ee_reports_privately	2m 38s
tag_latest_ee	39s
verify_ee_image_vulnerabilities	0s
tag_latest	20s
attach_amd64_binary_to_release	0s
build_slim	0s
build_full	0s
	48m 9s

Provide feedback