am b7f49237: Merge "Fix MIPS build."

* commit 'b7f492375291306065472b67011eebb324de1022':
  Fix MIPS build.