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