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

Change-Id: Ic9bcd8f06849eafafd5adefab86667b21d92586f