Merge "stagefright: fix error code return"