Fixes (or makes better) various builds. TBR=iant CC=golang-codereviews https://golang.org/cl/146280043
Attach a file by drag & drop or click to upload
