Merge "Fix the mips build."
am: 0f8bd686e1

* commit '0f8bd686e1ef6f5936d478cff4de8d9248daca35':
  Fix the mips build.