trying to fix dock audio
based off commits for s2 and s3

Change-Id: Ia67ebc1aa7cc70c5582dbd8b1d7e9326beb18da1
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_device_samsung_aries-common into cm-10.2