Rewrite imports for golang subrepositories.

As per this announcement:
https://groups.google.com/forum/m/#!msg/golang-announce/eD8dh3T9yyA/HDOEU_ZSmvAJ
Merge branch 'master' into golang-x
Merge branch 'golang-x'