Merge "Revert "MediaCodec: don't cache buffers until requested"" into tm-dev