Merge "Switch tar to zip for factory images am: d68beabe33 am: 18257fd91e am: 8a07b299ca am: f05bd98958 am: 9df1bab6ac am: 70c896dd14" into nyc-mr1-dev-plus-aosp