Merge changes from topic 'host_suffix_cleanup'

* changes:
  Remove "_static" suffix from libsparse
  Remove "_static" suffix from libext4_utils.

Android.mk

@@ -76,8 +76,8 @@ LOCAL_C_INCLUDES += \
 LOCAL_STATIC_LIBRARIES := \
     libbatterymonitor \
     libbootloader_message \
-    libext4_utils_static \
-    libsparse_static \
+    libext4_utils \
+    libsparse \
     libziparchive \
     libotautil \
     libmounts \

tests/Android.mk

@@ -99,8 +99,8 @@ LOCAL_STATIC_LIBRARIES := \
     libfs_mgr \
     liblog \
     libselinux \
-    libext4_utils_static \
-    libsparse_static \
+    libext4_utils \
+    libsparse \
     libcrypto_utils \
     libcrypto \
     libcutils \

updater/Android.mk

@@ -31,13 +31,13 @@ updater_common_static_libraries := \
     libutils \
     libmounts \
     libotafault \
-    libext4_utils_static \
+    libext4_utils \
     libfec \
     libfec_rs \
     libfs_mgr \
     liblog \
     libselinux \
-    libsparse_static \
+    libsparse \
     libsquashfs_utils \
     libbz \
     libz \