Merge "Cleanup MemcLockManager and move it to /libs"