R=r CC=golang-dev https://golang.org/cl/6026043
R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/5845057
R=golang-dev, r CC=golang-dev https://golang.org/cl/5572056