Merge "zip_archive_test: compare error codes directly." am: d1e9e7bc06 am: 9be5dbed91 am: ecc0b6c605
am: 5a6b3e05a9

Change-Id: I2a69e0d8bac2ddd7c0ddebfc6b32154f0628d49e