am b95ad82f: am 95a2a7f3: Merge "Fix MIPS build."

* commit 'b95ad82f7d175a4f79eb0cbf6caedf0653603590':
  Fix MIPS build.