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