R=golang-dev, rsc CC=golang-dev https://golang.org/cl/6849105
Fixes #3241. R=golang-dev, r CC=golang-dev https://golang.org/cl/5835043