Merge "Minor fixes to mips64 for the arch-specific optimisation framework."