Merge "services/identity: Switch from code.google.com/p/oauth to golang.org/x/oauth2."