Merge "media: hook up MediaCodec.setSurface" into mnc-dev