Switch tar to zip for factory images am: d68beabe33 am: 18257fd91e am: 8a07b299ca am: f05bd98958
am: 9df1bab6ac

Change-Id: I82ad82088def0994fb15777a3e603e9f51bde93d