Merge "soundtrigger JNI: fix AudioFormat channel mask"