am 17b3420f: am c2182c67: Merge "Clarification of MediaCodec behaviour when...
am 17b3420f: am c2182c67: Merge "Clarification of MediaCodec behaviour when codec specific data is included" into jb-dev
* commit '17b3420f':
Clarification of MediaCodec behaviour when codec specific data is included