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

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