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

Change-Id: I25fe481e753ae5419e79fd9e184635f9513815b1