This change also updates bind/testdata/*.golden. LGTM=crawshaw R=crawshaw CC=golang-codereviews https://golang.org/cl/167160043
This change also updates bind/testdata/*.golden. LGTM=crawshaw R=crawshaw CC=golang-codereviews https://golang.org/cl/167160043