goprotobuf: fix generation of multi test protos, and make main_test run again.

TBR=r
CC=golang-dev
http://codereview.appspot.com/5823056
2 files changed