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

Conflicts:
	CleanSpec.mk
	core/Makefile
	core/binary.mk
	core/build_id.mk
	core/combo/TARGET_linux-arm.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/combo/select.mk
	core/config.mk
	core/definitions.mk
	core/dex_preopt.mk
	core/dumpvar.mk
	core/host_java_library.mk
	core/java_library.mk
	core/main.mk
	core/package.mk
	core/tasks/collect_gpl_sources.mk
	core/version_defaults.mk
	envsetup.sh
	target/product/full_base_telephony.mk
	tools/releasetools/ota_from_target_files
	tools/roomservice.py