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

Change-Id: I52de71103b9f4ffde326762308fc3ee9432637e0