consolidate audio and display on 8974 common

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