Submitted accidentally in CL 83630044. Fixes various builds. TBR=khr CC=golang-codereviews https://golang.org/cl/83100047
