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

Change-Id: Ia22000d331ecf20ff5a83654262d88acc255b454