Merge "MIPS: Drop unnecessary code for R6 (NAN2008)"