Merge "ARM/ARM64: Improve lock/unlock entrypoints." am: b2683cb0ae
am: 866a3df2ed

Change-Id: I6f73dfba71b0a21f56c0f77f6e6a7b802458ce05