Back out "Revert D64082731" (#6339) #4637

Job	Run time
build-benchmark-app / macos-job	23m 45s
build-demo-ios / macos-job	15m 50s
build-frameworks-ios / macos-job	28m 6s
upload-demo-ios	20s
test-demo-ios / mobile-job (ios)	15m 56s
upload-frameworks-ios	22s
	1h 24m 19s

Provide feedback