Use stock mixer_paths.xml with stock audio.primary

Change-Id: Ia7ca8538408399a9bdb8f60a931a088daef624d9
Merge branch 'cm-11.0' into kk_mkt