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

Conflicts:
	hardware.c
	include/hardware/audio.h
	include/hardware/bt_hh.h
	include/hardware/gralloc.h
	include/hardware/power.h