Package builder scripts updated

Per-package vars files updated.

Change-Id: I6b52d1767baff611269cf81c26f0373066437cc8