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

* commit '18e8be647d9c235608c41fe065641fe7fcc43698':