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

Change-Id: Iaf552adf691345ff98bc72e8cbfcc9fc7e3fb04f