build: reorder more BuildPackages lines to deal with ABI_VERSION