SQLite compatibility for Echo database patches

These patches allow Echo update to stay compatible with SQLite.

Change-Id: Ie4d0b4ec40bcc504096e87f469be0e96271daec1
Merge "SQLite compatibility for Echo database patches"