am a93686a4: am 4613b7e3: Merge "3rd time\'s the charm, right? Fix another...
am a93686a4: am 4613b7e3: Merge "3rd time\'s the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev
* commit 'a93686a4':
3rd time's the charm, right? Fix another instance where MediaCodec would