Merge "SoundTrigger API improvements."