Merge "Fixing typos in ProtoOutputStream doccomment."