Merge "Clarification of MediaCodec behaviour when codec specific data is included" into jb-dev