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

Change-Id: I5ea52be06cb8c90ea667556aad851c5a35029e0a