am 7cb386ab: am b276338f: Merge "Fix a compilation error for Mips64."

* commit '7cb386ab19c5ab62de83ce97c057749bccea9c15':
  Fix a compilation error for Mips64.