DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e.

There are no functional changes here. This is in place to make merge
conflicts less likely if any further changes are made to this code in
the future.

Test: make
Test: zip_archive_test
Bug: 64211847

Change-Id: I80ff9712c85d602d27f132ac54f62b3524ac9106