Merge "zip_archive: validate data descriptor contents." am: b001cc5b1c
am: ec95719844

Change-Id: Ie1d5c733c478100b4e7b09be4ef4f59f9bb6d688