Merge "MIPS: Improve object lock/unlock." am: 728411b540 am: df8ce99c1e am: c3faa49a14
am: 2e8a3e5a38

Change-Id: I541be33b0a0f393b1f65c5cc1d5aae0c5709bef9