Merge "libziparchive: remove now-unused FindEntry overload." am: 1d5745fb40
am: 7ed43aafb1

Change-Id: I3ce6447a4e8a59bdb20475e5e3663139849f87f8