Merge "ZipWriter: Keep LFH and CFH in sync" am: a309bc491d
am: 80d8a9350c

Change-Id: Ic6b7335a0af0203368fda3f5fb130716229ec0d8