Merge changes I6892f028,I2e52c3ab

* changes:
  RELAND MediaCodec: don't cache buffers until requested
  Revert "MediaCodec: don't cache buffers until requested"