Merge "MIPS: HRor clean-up"
am: 4b45bb98a3

* commit '4b45bb98a3f06827cb14217e5b968cefd31ae9ca':
  MIPS: HRor clean-up