switch to TARGET_CPU_VARIANT as AOSP uses