Merge TP1A.220310.002

Change-Id: Id4f3bd248fa4fc86f27f5dba9fa88361da64582a
diff --git a/apex/Android.bp b/apex/Android.bp
index df25414..c430e32 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -113,12 +113,7 @@
             ],
         },
     },
-    native_header_libs: [
-        "libandroidicu_headers",
-        "libicuuc_headers",
-    ],
     native_shared_libs: [
-        "libandroidicu",
         "libicu",
     ],
 }