Merge tag 'android-4.4_r1.2' into cm-11.0

Android 4.4 Release 1.2

Conflicts:
	core/Makefile
	target/product/generic_no_telephony.mk
	target/product/sdk.mk
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files