diff --git a/Android.mk b/Android.mk
index 18dc577..364fb39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -194,11 +194,11 @@
 LOCAL_STATIC_LIBRARIES := \
     update_metadata-protos \
     $(ue_common_static_libraries) \
-    $(ue_libpayload_consumer_exported_static_libraries:-host=) \
+    $(ue_libpayload_consumer_exported_static_libraries) \
     $(ue_update_metadata_protos_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES := \
     $(ue_common_shared_libraries) \
-    $(ue_libpayload_consumer_exported_shared_libraries:-host=) \
+    $(ue_libpayload_consumer_exported_shared_libraries) \
     $(ue_update_metadata_protos_exported_shared_libraries)
 LOCAL_SRC_FILES := $(ue_libpayload_consumer_src_files)
 include $(BUILD_STATIC_LIBRARY)
@@ -247,21 +247,20 @@
 ue_libupdate_engine_exported_static_libraries := \
     libpayload_consumer \
     update_metadata-protos \
-    libbootloader_message \
-    libbz \
-    libfs_mgr \
-    libbase \
-    liblog \
     $(ue_libpayload_consumer_exported_static_libraries) \
     $(ue_update_metadata_protos_exported_static_libraries) \
     libupdate_engine_boot_control \
     $(ue_libupdate_engine_boot_control_exported_static_libraries)
 ue_libupdate_engine_exported_shared_libraries := \
-    libmetrics \
-    libexpat \
+    libbase \
+    libbootloader_message \
     libbrillo-policy \
     libcurl \
     libcutils \
+    libexpat \
+    libfs_mgr \
+    liblog \
+    libmetrics \
     libssl \
     $(ue_libpayload_consumer_exported_shared_libraries) \
     $(ue_update_metadata_protos_exported_shared_libraries) \
@@ -289,13 +288,13 @@
     libpayload_consumer \
     update_metadata-protos \
     $(ue_common_static_libraries) \
-    $(ue_libupdate_engine_exported_static_libraries:-host=) \
-    $(ue_libpayload_consumer_exported_static_libraries:-host=) \
+    $(ue_libupdate_engine_exported_static_libraries) \
+    $(ue_libpayload_consumer_exported_static_libraries) \
     $(ue_update_metadata_protos_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES := \
     $(ue_common_shared_libraries) \
-    $(ue_libupdate_engine_exported_shared_libraries:-host=) \
-    $(ue_libpayload_consumer_exported_shared_libraries:-host=) \
+    $(ue_libupdate_engine_exported_shared_libraries) \
+    $(ue_libpayload_consumer_exported_shared_libraries) \
     $(ue_update_metadata_protos_exported_shared_libraries)
 LOCAL_SRC_FILES := \
     certificate_checker.cc \
@@ -368,10 +367,6 @@
 # loop to apply payloads provided by the upper layer via a Binder interface.
 ue_libupdate_engine_android_exported_static_libraries := \
     libpayload_consumer \
-    libbootloader_message \
-    libfs_mgr \
-    libbase \
-    liblog \
     $(ue_libpayload_consumer_exported_static_libraries) \
     libupdate_engine_boot_control \
     $(ue_libupdate_engine_boot_control_exported_static_libraries)
@@ -379,11 +374,15 @@
     $(ue_libpayload_consumer_exported_shared_libraries) \
     $(ue_libupdate_engine_boot_control_exported_shared_libraries) \
     libandroid_net \
+    libbase \
     libbinder \
     libbinderwrapper \
+    libbootloader_message \
     libbrillo-binder \
-    libcutils \
     libcurl \
+    libcutils \
+    libfs_mgr \
+    liblog \
     libmetricslogger \
     libssl \
     libutils
@@ -403,10 +402,10 @@
     external/cros/system_api/dbus
 LOCAL_STATIC_LIBRARIES := \
     $(ue_common_static_libraries) \
-    $(ue_libupdate_engine_android_exported_static_libraries:-host=)
+    $(ue_libupdate_engine_android_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES += \
     $(ue_common_shared_libraries) \
-    $(ue_libupdate_engine_android_exported_shared_libraries:-host=)
+    $(ue_libupdate_engine_android_exported_shared_libraries)
 LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/binder_bindings
 LOCAL_SRC_FILES += \
     binder_bindings/android/os/IUpdateEngine.aidl \
@@ -455,15 +454,15 @@
     $(ue_libupdate_engine_exported_c_includes)
 LOCAL_STATIC_LIBRARIES += \
     libupdate_engine \
-    $(ue_libupdate_engine_exported_static_libraries:-host=)
+    $(ue_libupdate_engine_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES += \
-    $(ue_libupdate_engine_exported_shared_libraries:-host=)
+    $(ue_libupdate_engine_exported_shared_libraries)
 else  # local_use_omaha == 1
 LOCAL_STATIC_LIBRARIES += \
     libupdate_engine_android \
-    $(ue_libupdate_engine_android_exported_static_libraries:-host=)
+    $(ue_libupdate_engine_android_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES += \
-    $(ue_libupdate_engine_android_exported_shared_libraries:-host=)
+    $(ue_libupdate_engine_android_exported_shared_libraries)
 endif  # local_use_omaha == 1
 
 LOCAL_INIT_RC := update_engine.rc
@@ -516,7 +515,7 @@
     libpayload_consumer \
     update_metadata-protos \
     $(ue_common_static_libraries) \
-    $(ue_libpayload_consumer_exported_static_libraries:-host=) \
+    $(ue_libpayload_consumer_exported_static_libraries) \
     $(ue_update_metadata_protos_exported_static_libraries)
 # We add the static versions of the shared libraries that are not installed to
 # recovery image due to size concerns. Need to include all the static library
@@ -636,7 +635,6 @@
     liblzma \
     libpayload_consumer \
     libpuffdiff \
-    libz \
     update_metadata-protos \
     $(ue_libpayload_consumer_exported_static_libraries) \
     $(ue_update_metadata_protos_exported_static_libraries)
@@ -720,12 +718,12 @@
     update_metadata-protos \
     liblzma \
     $(ue_common_static_libraries) \
-    $(ue_libpayload_consumer_exported_static_libraries:-host=) \
+    $(ue_libpayload_consumer_exported_static_libraries) \
     $(ue_update_metadata_protos_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES := \
     $(ue_common_shared_libraries) \
-    $(ue_libpayload_generator_exported_shared_libraries:-host=) \
-    $(ue_libpayload_consumer_exported_shared_libraries:-host=) \
+    $(ue_libpayload_generator_exported_shared_libraries) \
+    $(ue_libpayload_consumer_exported_shared_libraries) \
     $(ue_update_metadata_protos_exported_shared_libraries)
 LOCAL_SRC_FILES := $(ue_libpayload_generator_src_files)
 include $(BUILD_STATIC_LIBRARY)
@@ -776,12 +774,12 @@
     libpayload_consumer \
     libpayload_generator \
     $(ue_common_static_libraries) \
-    $(ue_libpayload_consumer_exported_static_libraries:-host=) \
-    $(ue_libpayload_generator_exported_static_libraries:-host=)
+    $(ue_libpayload_consumer_exported_static_libraries) \
+    $(ue_libpayload_generator_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES := \
     $(ue_common_shared_libraries) \
-    $(ue_libpayload_consumer_exported_shared_libraries:-host=) \
-    $(ue_libpayload_generator_exported_shared_libraries:-host=)
+    $(ue_libpayload_consumer_exported_shared_libraries) \
+    $(ue_libpayload_generator_exported_shared_libraries)
 LOCAL_SRC_FILES := $(ue_delta_generator_src_files)
 include $(BUILD_EXECUTABLE)
 
@@ -916,10 +914,10 @@
     libgmock \
     libchrome_test_helpers \
     $(ue_common_static_libraries) \
-    $(ue_libpayload_generator_exported_static_libraries:-host=)
+    $(ue_libpayload_generator_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES := \
     $(ue_common_shared_libraries) \
-    $(ue_libpayload_generator_exported_shared_libraries:-host=)
+    $(ue_libpayload_generator_exported_shared_libraries)
 LOCAL_SRC_FILES := \
     certificate_checker_unittest.cc \
     common/action_pipe_unittest.cc \
@@ -978,9 +976,9 @@
     $(ue_libupdate_engine_exported_c_includes)
 LOCAL_STATIC_LIBRARIES += \
     libupdate_engine \
-    $(ue_libupdate_engine_exported_static_libraries:-host=)
+    $(ue_libupdate_engine_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES += \
-    $(ue_libupdate_engine_exported_shared_libraries:-host=)
+    $(ue_libupdate_engine_exported_shared_libraries)
 LOCAL_SRC_FILES += \
     common_service_unittest.cc \
     fake_system_state.cc \
@@ -1022,9 +1020,9 @@
 else  # local_use_omaha == 1
 LOCAL_STATIC_LIBRARIES += \
     libupdate_engine_android \
-    $(ue_libupdate_engine_android_exported_static_libraries:-host=)
+    $(ue_libupdate_engine_android_exported_static_libraries)
 LOCAL_SHARED_LIBRARIES += \
-    $(ue_libupdate_engine_android_exported_shared_libraries:-host=)
+    $(ue_libupdate_engine_android_exported_shared_libraries)
 LOCAL_SRC_FILES += \
     update_attempter_android_unittest.cc
 endif  # local_use_omaha == 1