merge required audio left-overs from CM

Conflicts:
	include/system/audio.h