am 1f85b46b: am dca5fb9e: Merge "Enable SQLite configuration to be set with...
am 1f85b46b: am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev
* commit '1f85b46b':
Enable SQLite configuration to be set with system properties.