Merge "media: trivial implementation of MediaCodec.detachOutputSurface" into main