This allows us to use the same database implementation for Android and servers.
Also adjusted Log trait and visibility of library classes.