am 3e8d7cfd: Merge "Clean up SQLite debugging code."

* commit '3e8d7cfd1e6e65a60a9f6b7e174672dc9a281e49':
  Clean up SQLite debugging code.