Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am:...

Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: 00b9a212 am: acad3df8 am: f58fc7b5
am: 229f35a4

Change-Id: I85ee278323a578fcf941651161b46ef0559098cc

app/Android.mk

@@ -28,7 +28,7 @@ LOCAL_STATIC_LIBRARIES := libminikin_host
 
 LOCAL_SHARED_LIBRARIES := \
     liblog \
-    libicuuc-host
+    libicuuc
 
 LOCAL_SRC_FILES += \
     HyphTool.cpp

libs/minikin/Android.mk

@@ -109,7 +109,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
 LOCAL_C_INCLUDES := $(minikin_c_includes)
 LOCAL_CPPFLAGS += -Werror -Wall -Wextra $(enable_race_detection)
-LOCAL_SHARED_LIBRARIES := liblog libicuuc-host
+LOCAL_SHARED_LIBRARIES := liblog libicuuc
 
 LOCAL_SRC_FILES := Hyphenator.cpp