Merge tag 'android-4.4_r1' into kitkat

Android 4.4 Release 1.0

Conflicts:
	core/Makefile
	core/base_rules.mk
	core/build_id.mk
	core/combo/TARGET_linux-arm.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/dex_preopt.mk
	core/version_defaults.mk
	target/product/core.mk
	target/product/generic_no_telephony.mk
	target/product/mini.mk
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files