Build ZIP package for CDI add-on (#11606)

Change-Id: Ib6611747f5a87a33a1a146292dd6a9771d6604c1