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

Change-Id: I6d0e6f9fdc9140cd2cae840e1bd2212863a3b623