Merge "stagefright: use MediaImage2" into nyc-dev