Merge "libziparchive: fix -Wimplicit-int-float-conversion"
am: 8e2f75e319

Change-Id: If649b5fc45c5c1c0cf40dd95fc989d232eae5b10