Merge "ZipWriter: Keep LFH and CFH in sync" am: a309bc491d am: 80d8a9350c
am: 5382a520e0  -s ours

Change-Id: If58c5af7e8f171d7399500fc6cb88cfce9a1d3fc