Merge "stagefright: return an empty array if using surface inputs" into...
Merge "stagefright: return an empty array if using surface inputs" into nyc-mr1-dev am: 5316f999 am: 066cb192
am: 249013c7
Change-Id: I0becea0d738c07790798350029a314cb91529e3f