Merge "Fix broken mips build, where clang is generating an invalid movn."
am: c02a461907

* commit 'c02a461907a897d3f0824a3715596803e7065416':
  Fix broken mips build, where clang is generating an invalid movn.