Merge "SoundTrigger system API changes."