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

Change-Id: I2b012f8e4fbba4ab520b46fcebf541ad3f3fc47c