Merge "Revert "Fix broken mips build, where clang is generating an invalid movn.""