[automerger skipped] Revert SQLiteQueryBuilder for now. am: 6c90f1ded2 am: d551877fe8
am: 1bf3db90f4  -s ours

Change-Id: I5c2a95ff7121a33a90d46ca07cc78bcd0d240354