audio: Fix merge issues

Change-Id: If72942b042ab1cebd1788644954fd13eee028e49
Merge remote-tracking branch 'cm/cm-10.2' into HEAD