Merge '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: I1343f375828c1e15db7f297e1deb7d08c7b38be0

Conflicts:
	target/product/core.mk