consolidate audio and display

Change-Id: I41243a4d1ff131e30bfbc03dd6c034e994edfde9
Merge remote-tracking branch 'cm/cm-12.0' into lollipop