Route a2dp output via audio.primary.so

Change-Id: I2b5f2bebafaccb6f56005bb39e97486e36379276

Conflicts:
	configs/CHANGELOG-CM.txt