Merge "Remove libandroidicu usage" am: cc3049a2c2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378888

Change-Id: I6e006408ef213cd8ba1f2a6c46a1edf7c9bd92a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/jni/Android.bp

@@ -260,7 +260,6 @@ cc_library_shared {
                 "av-types-aidl-cpp",
                 "android.hardware.camera.device@3.2",
                 "libandroid_net",
-                "libandroidicu",
                 "libbattery",
                 "libnetdutils",
                 "libmemtrack",
@@ -280,6 +279,7 @@ cc_library_shared {
                 "libpermission",
                 "libsensor",
                 "libinput",
+                "libicu",
                 "libcamera_client",
                 "libcamera_metadata",
                 "libprocinfo",

libs/hwui/jni/Paint.cpp

@@ -35,7 +35,6 @@
 #include "SkShader.h"
 #include "SkBlendMode.h"
 #include "unicode/uloc.h"
-#include "unicode/ushape.h"
 #include "utils/Blur.h"
 
 #include <hwui/BlurDrawLooper.h>