Merge pull request #20982 from Microsoft/jstarks/fix_tp5_commit

Windows: Revendor github.com/Microsoft/hcsshim