am 8ae7aa94: Merge "Remove copy & paste cruft from the mips64 combo."

* commit '8ae7aa942bf7d0844bcdfb6116076a21837ded4c':
  Remove copy & paste cruft from the mips64 combo.