am 605cc293: am 83bf28e6: Merge "Fix MIPS build."

# Via Android Git Automerger (1) and others
* commit '605cc29358c9a6d575d097fd4b78a483c9dbf89e':
  Fix MIPS build.