Merge "MIPS: Improve object lock/unlock."