Merge "Fix error recovery in Stagefright init."