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

Change-Id: I07b03e639aec39ba66907ce5e2402632f345bac2