Merge commit '39b285acd4d4cfb4bb66482b58028c631b162c5d' into kitkat

Conflicts:
	CleanSpec.mk
	core/Makefile
	core/build_id.mk
	core/config.mk
	core/definitions.mk
	core/dumpvar.mk
	core/tasks/kernel.mk
	core/version_defaults.mk
	envsetup.sh
	target/board/generic/BoardConfig.mk
	target/product/core_minimal.mk
	target/product/full_base.mk
	target/product/generic_no_telephony.mk
	target/product/languages_full.mk
	target/product/languages_small.mk
	target/product/sdk.mk
	tools/buildinfo.sh
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files
	tools/roomservice.py