Merge "Allow parsing zip entries larger than 4GiB" am: 148f7af18a am: cf14d38562

Change-Id: I0dd6040c13c3c9ac912d631eabab19f33a4b2122