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

Change-Id: I66b7f61f216a88671a4630fd4cc7d9bfbb4785b9