Merge "Use ARCH_ARM_HAVE_VFP instead of TARGET_ARCH_VARIANT"