Merge "objectcache: Remove lock()/unlock() stubs from MemcachedClient"