diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk
index 178ecdd..17b411f 100644
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@ -4,7 +4,7 @@
 # Common settings #
 # ================#
 # ZipArchive support, the order matters here to get all symbols.
-COMMON_ZIP_LIBRARIES := libziparchive libz libcrypto_static
+COMMON_ZIP_LIBRARIES := libziparchive libz libcrypto
 
 # TODO: ideally the tests should depend on a shared dumpstate library, but currently libdumpstate
 # is used to define the device-specific HAL library. Instead, both dumpstate and dumpstate_test
@@ -23,10 +23,10 @@
         libhardware_legacy \
         liblog \
         libselinux \
-        libutils
-COMMON_STATIC_LIBRARIES := \
-        libdumpstateutil \
+        libutils \
         $(COMMON_ZIP_LIBRARIES)
+COMMON_STATIC_LIBRARIES := \
+        libdumpstateutil
 
 # ====================#
 # libdumpstateutil #
diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp
index 34697d1..5a0a93b 100644
--- a/vulkan/libvulkan/Android.bp
+++ b/vulkan/libvulkan/Android.bp
@@ -65,9 +65,9 @@
     export_static_lib_headers: ["vulkan_headers"],
     static_libs: [
         "vulkan_headers",
-        "libziparchive",
     ],
     shared_libs: [
+        "libziparchive",
         "libhardware",
         "libsync",
         "libbase",