R=golang-dev, nigeltao CC=golang-dev https://golang.org/cl/5758047
R=r, rsc CC=go-dev http://go/go-review/1017051