oauth2: add vanity URL import comments, use the vanity URL on builds

Change-Id: Ia20e40d98aa709e3d598388e0a15501584152ab5

google/appengine.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 
 	"appengine"
 	"appengine/memcache"

google/appengine_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 
 	"appengine"
 	"appengine/memcache"

google/appenginevm.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/memcache"
 )

google/appenginevm_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/memcache"
 )

google/example_test.go

@@ -12,8 +12,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/golang/oauth2"
-	"github.com/golang/oauth2/google"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
 	"google.golang.org/appengine"
 )
 

google/google.go

@@ -11,7 +11,7 @@
 //
 // For more information, please read
 // https://developers.google.com/accounts/docs/OAuth2.
-package google
+package google // import "golang.org/x/oauth2/google"
 
 import (
 	"encoding/json"
@@ -22,8 +22,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/golang/oauth2"
-	"github.com/golang/oauth2/internal"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/internal"
 )
 
 var (