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

Change-Id: I64400ffb9578be19d187e02efb6ef9204af783cf