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

Change-Id: Ifd679c79aebe6997af9d5adaf550e0f1804a6693