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

Change-Id: Id6e09ef992cc2351b35359de9df1afb96ba94516