Build fix for TARGET_CPU_VARIANT