Merge pull request #569 from crosbymichael/linux-builtin

Change linux runtime(w shim) to builtin

cmd/containerd/builtins.go

@@ -2,6 +2,7 @@ package main
 
 // register containerd builtins here
 import (
+	_ "github.com/docker/containerd/linux"
 	_ "github.com/docker/containerd/services/content"
 	_ "github.com/docker/containerd/services/execution"
 )