Revert "TARGET_ARCH_VARIANT_CPU -> TARGET_CPU_VARIANT"

They're different... can't -mtune krait, but krait is a valid bionic cpu variant

This reverts commit e049547a4ea884cbd58bcc752f35e562c8aa8e91