Merge "stagefright: return an empty array if using surface inputs" into nyc-mr1-dev