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

Change-Id: I06f20c0edf1cc60bd39f38d45d512cfbf39bb0a9