Merge "MIPS: Improve object lock/unlock."
am: 728411b540

Change-Id: I35f049bb04f55327ce66d3a5dc496abb060f1942