Merge "zip_writer_test.cc: fix implicit integer truncation" am: 9780fc3511
am: 8c5243c99d

Change-Id: Ic95261116cd47539f732e2b1dc34161c5b1b5940