build: Cleanup CPU-specific optimizations

 * TARGET_ARCH_CPU_VARIANT was a Linaro thing. Now that Android
   introducted TARGET_CPU_VARIANT, we should use this instead.
 * Added CFLAGS for Krait and Scorpion after the cleanup.

Change-Id: Iafb40ecefa353a1169c22601be4ce80069c3f587
envsetup: Fix giant derp

Change-Id: I490556f18c40c3614e4e554d7db3306a16ff99d8
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	core/combo/arch/arm/armv7-a.mk