Merge 4.3_r2.1 changes

Conflicts:
	core/Makefile
	core/combo/HOST_darwin-x86.mk
	core/combo/TARGET_linux-arm.mk
	core/combo/TARGET_linux-mips.mk
	core/definitions.mk
	core/droiddoc.mk
	core/dumpvar.mk
	core/java_library.mk
	core/main.mk
	core/pathmap.mk
	core/tasks/apicheck.mk
	envsetup.sh
	target/product/base.mk
	target/product/core.mk
	target/product/generic_no_telephony.mk
	target/product/languages_full.mk
	target/product/sdk.mk
	tools/releasetools/build_image.py