Merge "ZipWriter: Keep LFH and CFH in sync"