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

* commit '112619b08cb7adb80fd163aafaf99a12c58502d9':
  stagefright: use MediaImage2