Merge remote-tracking branch 'vanir/jb42-master' into jb43

Conflicts:
	core/Makefile
	core/base_rules.mk
	core/combo/arch/arm/armv7-a.mk
	target/product/emulator.mk
	target/product/full_base.mk

Change-Id: Ief84eb8584deec9c44da21610d27d1c31e31da95
Merge tag 'android-4.3_r2.1' into jb43

Android 4.3 release 2.1

Conflicts:
	core/build_id.mk
	core/combo/TARGET_linux-arm.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/definitions.mk
	core/dex_preopt.mk
	core/java_library.mk
	core/main.mk
	core/tasks/apicheck.mk
	core/tasks/vendor_module_check.mk
	envsetup.sh
	target/product/base.mk
	target/product/core.mk
	target/product/full_base.mk
	target/product/generic_no_telephony.mk
	tools/droiddoc/templates-pdk/assets/images/home/devphone-large.png
	tools/droiddoc/templates-pdk/assets/images/home/gdc-logo.png
	tools/releasetools/common.py