Merge "SoundTriggerTestApp: also unload on error conditions"