Merge "MediaCodec now submits codec specific data automatically" into jb-dev