audio: Fix up r_submix config

Change-Id: I792845ba0ae6899b6edfc091f3ff5f23ce9484db
Merge branch 'cm' into HEAD