Merge "ZipWriter: Keep LFH and CFH in sync" into oc-dev am: d4c8d87a9b
am: 2e79e7a439

Change-Id: If89c0645d15fa758e31b179ceedbce3296b5f49a