audio_policy: Don't separate A2DP output

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