Merge "Switch tar to zip for factory images" am: eb68cdcc6c am: 1f94518b4f am: f375ead2e1
am: 167452afad

Change-Id: Ia2f58538f5cea91e8969996fd9f9670bb2e87efa