Merge "package.py - Enable adding AUX images in to packages"