Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev