Merge "stagefright: prevent component to be stuck on error" into oc-dev