am dd384c3e: am a6e9ae80: Merge "Fix MIPS build."

* commit 'dd384c3e7bae2e55981aeadee42f5ee0049219ec':
  Fix MIPS build.