Merge "audio: Fix audio effects schema for V6" am: 6918c455e1 am: aef1ef555c

Change-Id: I52c0a714f9fbfcbfe89d84154745f42968ca73e7