Handle new tag scheme in the packaging script

Change-Id: I8b7474eb82f94ed12c890090801e2afd3ef2e405