Merge "media: support MediaCodec::detachOutputSurface" into main