Merge "Make ProtoOutputStream public"
am: 566f8f0195

Change-Id: Id322686c850a1aa273d31c60c86e4fe052390d21