Merge make-sqlite.py from master incl sorting.

This restores the build to determinism.