Merge pull request #31853 from mlaventure/update-containerd-17.04

[17.04] Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73