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

Change-Id: I4498cd757d87c06b575ae205088151429520a984