Merge tag 'android-4.3_r2.1' of https://android.googlesource.com/platform/build into cm-10.1

Android 4.3 release 2.1

Conflicts:
	core/Makefile
	core/build_id.mk
	core/combo/HOST_darwin-x86.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/combo/arch/arm/armv7-a.mk
	core/definitions.mk
	core/droiddoc.mk
	core/java_library.mk
	core/main.mk
	core/pathmap.mk
	core/tasks/apicheck.mk
	envsetup.sh
	target/product/core.mk
	target/product/emulator.mk
	target/product/generic_no_telephony.mk
	target/product/languages_full.mk
	target/product/sdk.mk
	tools/releasetools/common.py
	tools/signapk/SignApk.java

Change-Id: Ie02aa7b0e21b53ae108716d425a6157475469c12

Conflicts:
	core/build_id.mk
	core/combo/HOST_darwin-x86.mk
	core/definitions.mk
	core/droiddoc.mk
	core/java_library.mk
	core/tasks/apicheck.mk
	core/tasks/vendor_module_check.mk
	envsetup.sh
	target/product/emulator.mk
	target/product/generic_no_telephony.mk
	target/product/languages_full.mk
	target/product/sdk.mk