Improve CI stages and fix cache

Merged username-removed-26331 requested to merge grote/repomaker:improve-ci into master

Also fix fdroidserver dependency as it is now on pypi.