consolidate audio and display on 8974 common

Change-Id: I22630810d97067cfe5c814759e83902c9e7c9ef6
Merge pull request #14 from CyanogenMod/cm-12.0

consolidate audio and display on 8974 common