Merge "soundtrigger: Switch audio service to load soundtrigger 2.1"