Merge "msm: ocmem: Add support for locking and unlocking regions" into msm-3.4