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

Change-Id: I24362dbd4aa00ef2cb9c6a5ffebbe67d5bad2df6