am 95387dd1: am f570883a: Merge "Fix MIPS build."

* commit '95387dd16262fbd730eaafcdebdaeeb0a35ea33a':
  Fix MIPS build.