goprotobuf: Fix merging of duplicate message set entries.

LGTM=crawshaw
R=crawshaw
CC=golang-codereviews
https://codereview.appspot.com/118400044
2 files changed