Underp an ifdef

Change-Id: If0e0f1fddcad3d7ec6987ecc5d4e6a40e605c39a

Conflicts:
	include/system/audio.h
merge required audio left-overs from CM
Merge remote-tracking branch 'brood/kk-4.4' into msoctos