Merge tag 'android-4.3_r2.1' into jb-mr2

Android 4.3 release 2.1

Conflicts:
	core/Makefile
	core/combo/arch/arm/armv7-a-neon.mk
	core/combo/arch/arm/armv7-a.mk
	core/definitions.mk
	core/pathmap.mk
	core/tasks/vendor_module_check.mk
	envsetup.sh
	target/product/core.mk
	target/product/generic_no_telephony.mk
	target/product/sdk.mk
	tools/releasetools/common.py
	tools/signapk/SignApk.java

Change-Id: If0699fdb282074182fa4e9c7ad7ff1b01838ea6f