am c47aa3bd: Merge "Fix mips build."

* commit 'c47aa3bd2acde49f858b21bcafd750b2981df7c0':
  Fix mips build.