am 88a42f9d: Merge "Fix MIPS build"

* commit '88a42f9daf0b081a40f7833875df4b04817319f6':
  Fix MIPS build