am fc67784b: am f9230087: Merge "stagefright: matroska: don\'t crash on...
am fc67784b: am f9230087: Merge "stagefright: matroska: don\'t crash on parsing error" into jb-mr2-dev
* commit 'fc67784b':
stagefright: matroska: don't crash on parsing error