Sync from internal version.
          - fix nil Marshaler fields
          - fix text encoding of nil

R=r
CC=golang-dev
http://codereview.appspot.com/2023043
3 files changed