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

Change-Id: I25f310f90c956ab5702d3e3487e911160922a25d