DO NOT MERGE: Fix broken archive tests.

Test: All archive unit tests pass on APCT.
Bug: 32541465
Change-Id: I2029611a0420abfe62fc098bd46c6ebe4619f05c
(cherry picked from commit 6776b9448ec1f36124be9b097ca0f8dfff9110b6)
2 files changed