am 8ace80b3: Merge "Fix mips build"

* commit '8ace80b37590e5b22c115698e20b8a9911f7a865':
  Fix mips build