am d169346b: am 7a1125bc: Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."

* commit 'd169346b055eaac6897c3edac9a77042fceb11b2':
  Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.