Merge "Fix broken Zip64 extended info size checks."