Merge remote-tracking branch 'github/kk4.4' into slim-master

Conflicts:
	audio/AudioPolicyManagerBase.cpp
	include/hardware_legacy/AudioHardwareInterface.h
	wifi/Android.mk
	wifi/wifi.c