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

Change-Id: Ibef87a6007460b6d752232ae328a55b7b7fc0eee