Merge pull request #22005 from crosbymichael/runc-source

Improve source for containerd/runc copy