Merge "[hardening] Switch to hardened libziparchive in system_server" into sc-dev