Revert "msm8660: scorpion CPU_VARIANT is broken; use cortex-a8 for now"

  * scorpion CPU_VARIANT fixed in http://review.cyanogenmod.org/#/c/56062

This reverts commit 360019f675b5895e2a1930d0318981a33c1ae8bd.

Change-Id: I3a8814ae92cab88b750c011cd60b75c061733725
Merge branch 'upstream/cm-11.0'