Merge "zip_archive.cc: add O_CLOEXEC" am: 958a669e58 am: f3f4a3babd
am: 794c8bb369

Change-Id: Ic1b934c96d2a4c27ee12cd443ddb18c1fa7ff053