Add Scorpion TARGET_CPU_VARIANT

Change-Id: I7e814f29681097e6b56fba61b1041e0bc42b3726
Merge remote branch 'omni/android-4.4' into android-4.4