Replace libziparchive-host with libziparchive

libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.

Change-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd

tools/aapt/Android.mk

@@ -61,7 +61,7 @@ aaptHostStaticLibs := \
     liblog \
     libcutils \
     libexpat \
-    libziparchive-host \
+    libziparchive \
     libbase
 
 aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"

tools/aapt2/Android.mk

@@ -126,7 +126,7 @@ hostStaticLibs := \
 	liblog \
 	libcutils \
 	libexpat \
-	libziparchive-host \
+	libziparchive \
 	libpng \
 	libbase \
 	libprotobuf-cpp-lite

tools/split-select/Android.mk

@@ -51,7 +51,7 @@ hostStaticLibs := \
     liblog \
     libcutils \
     libexpat \
-    libziparchive-host \
+    libziparchive \
     libbase
 
 cFlags := -Wall -Werror