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

* commit '4971de2a2efe448171b87471ad65e986c3608c21':
  media: hook up MediaCodec.setSurface