Merge "Work around broken MIPS build"