DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1.

Test: make
Test: zip_archive_test
Bug: 64211847

(cherry picked from commit 547c7d9a0b6651ace0ade7849661ba6c20770ae6)
(cherry picked from commit bfe4b5edb3097df66ddbf9639c3b3cd290734ed8)

Change-Id: Ide48ce66542e152d88520dcd6abcd104e48137f6
2 files changed