As advised by iant. Fixes windows build. R=golang-dev, r CC=golang-dev, iant https://golang.org/cl/9110044
Attach a file by drag & drop or click to upload
