Merge changes from topic "am-fbb309a963a844ca8afaf39ea6de23eb"

* changes:
  [automerger skipped] Merge changes from topic "sqlitez" am: a920b9c8 am: fd5131bb am: 74c52585  -s ours
  [automerger skipped] Bind update() args as Object[] for performance. am: 8a634372  -s ours am: 71ff75c6 am: 1afe2b41  -s ours
  [automerger skipped] Extend SQLiteQueryBuilder for update and delete. am: e56d8b8a  -s ours am: 8c8de576  -s ours am: 7038c501  -s ours
  [automerger skipped] Revert SQLiteQueryBuilder for now. am: 6c90f1de am: d551877f am: 1bf3db90  -s ours