Replace ART's core-platform-api stub with module-lib stubs

The stub should be identical now, and thus replacing it
should cause no behavior change.

Bug: 192645954
Bug: 192446466
Test: m droid
Change-Id: Ia44f51aa4676e94c4ecd985ba98e29481baca533
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 7a488cb..fec8afa 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -883,6 +883,7 @@
     name: "art.module.public.api",
     visibility: [
         "//art/build/sdk",
+        "//libcore/mmodules/core_platform_api",
         "//frameworks/base",
         "//frameworks/base/api",
     ],
@@ -997,6 +998,22 @@
     ],
 }
 
+// Used when compiling higher-level code against art.module.public.api.stubs.module_lib.
+//
+// This is only intended for use within core libraries and must not be used
+// from outside.
+java_system_modules {
+    name: "art-module-lib-api-stubs-system-modules",
+    visibility: [
+        "//art/build/sdk",
+        "//external/conscrypt",
+        "//external/icu/android_icu4j",
+    ],
+    libs: [
+        "art.module.public.api.stubs.module_lib",
+    ],
+}
+
 // A stubs target containing the parts of the public SDK API provided by the
 // core library.
 //