consolidate audio and display

Change-Id: I41243a4d1ff131e30bfbc03dd6c034e994edfde9
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_sony_msm8974-common into mkl