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

* commit '6a667c6fa96d2671a3072bec3a3496183703df12':
  media: hook up MediaCodec.setSurface