am 56094c11: am 43abdc48: Merge "Implement Surface input to MediaCodec." into jb-mr2-dev

* commit '56094c11cfa3cfa4d7c15378c9798e612f38f0f0':
  Implement Surface input to MediaCodec.