Merge "Use tools/currysrc/scripts/repackage-common.sh"
am: 947feefa70

Change-Id: I9d3c92af2314c30c8ac1732de4305caae263acfe