Merge "soundtrigger: Fall back to V2.0 if V2.1 is not present"