Merge pull request #20985 from jefferyto/python-incremental-fix-host-build