Merge "Make ProtoOutputStream public" am: 566f8f0195 am: cc7c338c48

Change-Id: Iddba6b53757a0d3f44e1bd607a5f516642b8e049