Merge "RELAND MediaCodec: don't cache buffers until requested" into stage-aosp-master