cmd/vendor: move cmd/internal/unvendor packages to cmd/vendor

Updates #14047

Change-Id: I4b150533393bfb90e840497095ac32bcca4f04c2
Reviewed-on: https://go-review.googlesource.com/23114
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

misc/nacl/testzip.proto

@@ -27,7 +27,12 @@ go	src=..
 			internal
 				objfile
 					objfile.go
-				unvendor
+			gofmt
+				gofmt.go
+				gofmt_test.go
+				testdata
+					+
+			vendor
 				golang.org
 					x
 						arch
@@ -39,11 +44,6 @@ go	src=..
 								x86asm
 									testdata
 										+
-			gofmt
-				gofmt.go
-				gofmt_test.go
-				testdata
-					+
 		archive
 			tar
 				testdata

src/cmd/internal/objfile/disasm.go

@@ -15,8 +15,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"cmd/internal/unvendor/golang.org/x/arch/arm/armasm"
-	"cmd/internal/unvendor/golang.org/x/arch/x86/x86asm"
+	"golang.org/x/arch/arm/armasm"
+	"golang.org/x/arch/x86/x86asm"
 )
 
 // Disasm is a disassembler for a given File.