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

Change-Id: I8ebb6bfa90d8e8a7fe0a948a7313cd977cd241a0