renaming_2: gofix -r go1pkgrename src/pkg/[a-l]*

R=rsc
CC=golang-dev
https://golang.org/cl/5358041
diff --git a/src/pkg/expvar/expvar_test.go b/src/pkg/expvar/expvar_test.go
index 8f7a481..fc60727 100644
--- a/src/pkg/expvar/expvar_test.go
+++ b/src/pkg/expvar/expvar_test.go
@@ -5,7 +5,7 @@
 package expvar
 
 import (
-	"json"
+	"encoding/json"
 	"testing"
 )