Move plugin registration to separate package

Only compile in plugin support on non-windows 1.8.
Re-enable go 1.7.x tests.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

services/content/service.go

@@ -5,10 +5,10 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/containerd"
 	api "github.com/docker/containerd/api/services/content"
 	"github.com/docker/containerd/content"
 	"github.com/docker/containerd/log"
+	"github.com/docker/containerd/plugin"
 	"github.com/golang/protobuf/ptypes/empty"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
@@ -30,13 +30,13 @@ var bufPool = sync.Pool{
 var _ api.ContentServer = &Service{}
 
 func init() {
-	containerd.Register("content-grpc", &containerd.Registration{
-		Type: containerd.GRPCPlugin,
+	plugin.Register("content-grpc", &plugin.Registration{
+		Type: plugin.GRPCPlugin,
 		Init: NewService,
 	})
 }
 
-func NewService(ic *containerd.InitContext) (interface{}, error) {
+func NewService(ic *plugin.InitContext) (interface{}, error) {
 	return &Service{
 		store: ic.Store,
 	}, nil

services/execution/service.go

@@ -7,6 +7,7 @@ import (
 	api "github.com/docker/containerd/api/services/execution"
 	"github.com/docker/containerd/api/types/container"
 	"github.com/docker/containerd/log"
+	"github.com/docker/containerd/plugin"
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -18,13 +19,13 @@ var (
 )
 
 func init() {
-	containerd.Register("runtime-grpc", &containerd.Registration{
-		Type: containerd.GRPCPlugin,
+	plugin.Register("runtime-grpc", &plugin.Registration{
+		Type: plugin.GRPCPlugin,
 		Init: New,
 	})
 }
 
-func New(ic *containerd.InitContext) (interface{}, error) {
+func New(ic *plugin.InitContext) (interface{}, error) {
 	c, err := newCollector(ic.Context, ic.Runtimes)
 	if err != nil {
 		return nil, err