am 8651c6f5: Merge "stagefright: add support for dynamically setting...
am 8651c6f5: Merge "stagefright: add support for dynamically setting MediaCodec output surface" into mnc-dev
* commit '8651c6f5':
stagefright: add support for dynamically setting MediaCodec output surface