Merge "Fixes for out-of-memory error in MediaCodec"