Merge remote-tracking branch 'cyan/cm-11.0' into cm-11.0

Conflicts:
	audio/AudioPolicyManagerBase.cpp
	audio/audio_hw_hal.cpp
	include/hardware_legacy/AudioHardwareInterface.h
	include/hardware_legacy/AudioSystemLegacy.h
	wifi/wifi.c