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

* commit '4613b7e38b1830535cbf00e962afdfa5fe1308ba':
  3rd time's the charm, right? Fix another instance where MediaCodec would