Merge "zip_util: temporary debugging on LFH header mismatches." into nyc-mr1-dev