Revert Build: Fix repack process

Change-Id: Iad87390be4e6408e75282bfbb8c0882c0ca8f86e