Merge "Added some lock()/unlock() support for SQLite using lock file emulation"