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

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