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

Change-Id: I88bdc3a7d7f007da28ad12387b6ba88c51ee877a