am 7b4cd9c6: Merge "Fix mips vs. mips64 build issues."

* commit '7b4cd9c62b527e0759ab76e4938a98415d5bc1ce':
  Fix mips vs. mips64 build issues.