am 95a2a7f3: Merge "Fix MIPS build."

* commit '95a2a7f325330830d6227aa683948b325e38e653':
  Fix MIPS build.