Forked
Merge branch 'kitkat' of https://github.com/hastalafiesta-/android_build into kitkat

Conflicts:
	core/combo/TARGET_linux-arm.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/combo/select.mk
	core/llvm_config.mk
	envsetup.sh
	tools/releasetools/ota_from_target_files
	tools/roomservice.py