sqlite: Backport bugfixes.

Bug: 962055, 962083
Change-Id: I374f86ba980484aa7471bdded7dad2b36e0d78fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1618155
Auto-Submit: Darwin Huang <huangdarwin@chromium.org>
Reviewed-by: Chris Mumford <cmumford@google.com>
Commit-Queue: Darwin Huang <huangdarwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661119}
13 files changed