am 6182008e: am 88a42f9d: Merge "Fix MIPS build"

* commit '6182008e731728fd413da7b12ba3daea0ca81c96':
  Fix MIPS build