go/build: clean up after rollback

R=rsc
CC=golang-dev
https://codereview.appspot.com/7237049