Merge "zip_archive: generalize deflate method." am: 661b3827a6 am: de0153c20b
am: a7ce0bc493

Change-Id: I2aeee5ff898247356cf1bdb10844ccbbf9034d88