am 701cf941: Merge "Fix mips build"

* commit '701cf9419b4df92bd959bbc6f18150f6ae76df7c':
  Fix mips build