Merge "stagefright: use MediaImage2" into nyc-dev
am: 1c0de60e80

* commit '1c0de60e809c116fb8cb0eded39270c6eb060a3b':
  stagefright: use MediaImage2