Merge "stagefright: prevent component to be stuck on error" into oc-dev am: 1c57d1e42a
am: 3854e6efb9

Change-Id: I84e341dd90b28b29821814704cc50cf9a6099eaa