am f355750d: am c47aa3bd: Merge "Fix mips build."

* commit 'f355750defa34d2e28d51a220947fea59c4f4429':
  Fix mips build.