Merge tag 'android-4.3_r2.1' of https://android.googlesource.com/platform/build into sm-jb-mr2

Android 4.3 release 2.1

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	core/combo/TARGET_linux-arm.mk
	core/combo/TARGET_linux-mips.mk
	core/combo/TARGET_linux-x86.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/combo/arch/arm/armv7-a.mk
	core/dumpvar.mk
	core/main.mk
	envsetup.sh
	target/product/core.mk
	target/product/generic_no_telephony.mk
	tools/adbs