Merge "Fix assertion failures in mips+msa setting" into nextgenv2