Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."