Merge "SoundTrigger: Fix AudioFormat constructor argument count"