Merge "MIPS: Correct instruction alignment."