am 2c5b6ab5: am 8389deee: Merge "mips64 should avoid common LP64 errors just like arm64 and x86-64."

* commit '2c5b6ab5ac5465d8d85bec748b5486b58c514637':
  mips64 should avoid common LP64 errors just like arm64 and x86-64.