Revert SQLiteQueryBuilder for now.
am: 6c90f1ded2

Change-Id: Ib8bfccd0d088b1a4c453b62c6527ca14cbadee41