Fixes build, too. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/6775088
Attach a file by drag & drop or click to upload
