Merge "Use tools/currysrc/scripts/repackage-common.sh"