Merge remote-tracking branch 'teameos/kk4.4' into kk4.4

Conflicts:
	BoardConfig.mk
	BoardConfigCommon.mk
	camera/CameraWrapper.cpp
	device-common.mk
	kernel-headers/linux/msm_ion.h
	kernel-headers/linux/msm_kgsl.h
	kernel-headers/linux/msm_vidc_dec.h
	kernel-headers/linux/msm_vidc_enc.h
	kernel-headers/linux/videodev2.h
	kernel-headers/media/msm_media_info.h
	kernel-headers/media/msm_vidc.h
	liblight/Android.mk
	liblight/lights.c
	mixer_paths.xml
	overlay/packages/apps/Torch/res/values/config.xml
	ramdisk/init.find7s.rc
	system.prop