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

Change-Id: I7d78cbe79fd5de20d822d9d9304bbf3d1ea7d9da