Merge "device-tests & general-tests: build out zips."