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

Change-Id: Id24f61623f260a77adb720d23e5f7ffe25410917