Merge pull request #277335 from adisbladis/buildenv-hoist-instantiation
build-support/buildenv: Hoist builder instantiation
authored by adisbladis and committed by GitHub 2 years ago dbc85690 054533f5