am 86b09d0f: am 8771be9a: Merge "Fix mips64 bugs."

* commit '86b09d0fecd1d01819a8680ae7be087be90489aa':
  Fix mips64 bugs.