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

* commit 'fe96c1891e42a408247ff6bf8827b3c8ffb68f83':