R=golang-dev, gri CC=golang-dev https://golang.org/cl/5674112
R=ken2 CC=golang-dev https://golang.org/cl/229046