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

Change-Id: I5a6579f4eb5bdb17a290ff4a1a93c0fe7e7a9e89