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