Move proxy CLI to main cmd/

Since this command is part of the official distribution and even
required for tests, let's move this up to the main cmd's.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

hack/make/binary-proxy

@@ -3,7 +3,7 @@
 set -e
 
 (
-	GO_PACKAGE='github.com/docker/docker/libnetwork/cmd/proxy'
+	GO_PACKAGE='github.com/docker/docker/cmd/docker-proxy'
 	BINARY_SHORT_NAME='docker-proxy'
 
 	source "${MAKEDIR}/.binary"

hack/make/dynbinary-proxy

@@ -9,7 +9,7 @@ set -e
 	export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}")     # ditto for osusergo
 	export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here
 
-	GO_PACKAGE='github.com/docker/docker/libnetwork/cmd/proxy'
+	GO_PACKAGE='github.com/docker/docker/cmd/docker-proxy'
 	BINARY_SHORT_NAME='docker-proxy'
 	source "${MAKEDIR}/.binary"
 )