Merge "Switch tar to zip for factory images"
am: eb68cdcc6c

Change-Id: Iec9bbe6117c86bdd6fbf8a916f51e118a92939c4