Merge changes from topic "am-fbb309a963a844ca8afaf39ea6de23eb"

* changes:
  [automerger skipped] Merge changes from topic "sqlitez" am: a920b9c85e am: fd5131bba5 am: 74c52585f4  -s ours
  [automerger skipped] Bind update() args as Object[] for performance. am: 8a634372b3  -s ours am: 71ff75c692 am: 1afe2b41b0  -s ours
  [automerger skipped] Extend SQLiteQueryBuilder for update and delete. am: e56d8b8a43  -s ours am: 8c8de576c7  -s ours am: 7038c5010d  -s ours
  [automerger skipped] Revert SQLiteQueryBuilder for now. am: 6c90f1ded2 am: d551877fe8 am: 1bf3db90f4  -s ours