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

This reverts commit d4dd589a8bcf5515ab2fb6e4a27983f06081c16f.