Merge "Ran clang-format on libziparchive sources and headers"
am: aa82721894

Change-Id: I04d2e03437ea1ada667c9fcc7b6e633a0c13712f