Merge "stagefright: fix stop-error-error crash"