Merge "media: test MediaCodec.setOutputSurface" into mnc-dev