Merge "MIPS64: Clean-up intrinsics code" am: 525b665cef
am: bf001becb7

* commit 'bf001becb784e6295cc07781da340d7ddf20d1fc':
  MIPS64: Clean-up intrinsics code