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