Merge "zip_archive.cc: Use static cast instead of masking"
am: ba80ab1373

Change-Id: I94a53eefaa93da90dd24d87aff6c656cffeca851