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

Change-Id: Ib6998b086957709f75047b728c8835a03e859846