Update repackage-common.sh to not use make. am: c091e06bc0 am: 1dfdf290dc
am: fdd807eb48

Change-Id: Ia785e475305895a23e8619d7f3188b02e88ddbf0