Merge "Implement Surface input to MediaCodec." into jb-mr2-dev