Merge "libziparchive headers are moved to local directory" am: 7b44858b91 am: 4724e91dad am: da3af937a1
am: a55bf0970d

Change-Id: Ifbba9a1b427cf37d3099e21335f77d231017e624