Merge "Fix integrity check when parsing zip64 eocd" am: b480dc4f3f

Change-Id: I4d42e3ca1d15b7ab07fdda4285ef6422cda7d047