Merge "media: surface parity for MediaCodec & Recorder"