Merge branch "android-4.3_r.2.1" into jb-mr2

Conflicts:
	core/Makefile
	core/base_rules.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/combo/arch/arm/armv7-a.mk
	core/definitions.mk
	core/envsetup.mk
	core/main.mk
	core/pathmap.mk
	core/qcom_utils.mk
	core/tasks/kernel.mk
	core/tasks/vendor_module_check.mk
	target/product/core.mk
	target/product/full_base.mk
	target/product/full_base_telephony.mk
	target/product/generic_no_telephony.mk
	tools/device/BoardConfig.mk.template
	tools/device/device.mk.template
	tools/device/makerecoveries.sh
	tools/device/mkrecoveryzip.sh
	tools/device/mkvendor.sh
	tools/releasetools/common.py
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files
	tools/signapk/SignApk.java