am 09f561b3: am b7f49237: Merge "Fix MIPS build."

* commit '09f561b38b880e551097b807585d0e037fa36442':
  Fix MIPS build.