Merge remote-tracking branch 'cm/cm-10.2' into HEAD

is pimping easy?
HELL YEAH

Conflicts:
	core/Makefile
	core/base_rules.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/config.mk
	core/envsetup.mk
	core/linaro_compilerchecks.mk
	core/main.mk
	core/product_config.mk
	core/tasks/kernel.mk
	envsetup.sh
	target/product/full_base.mk
	target/product/full_base_telephony.mk
	target/product/generic_no_telephony.mk
	target/product/sdk.mk
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files

Change-Id: Ib54bfbfa9c915f6920d91bad6148ae459b4f9c1d