Merge "MIPS32: Do not use _MIPS_ARCH_MIPS64R6 in MIPS32 code"
am: fddc19338d

Change-Id: I379521f84cf49d24d2191443cd7307ad6b85de79