Make system_server stubs consistent with other stubs

Include the module_api stubs in system_server one instead of
putting both of these jars on the classpath. Also rename it
to be in line with the other stubs.

Bug: 149293194
Test: m
Change-Id: I2a9318c8ae036edafac086687601fa73d9bf4678

services/Android.bp

@@ -144,7 +144,8 @@ droidstubs {
 }
 
 java_library {
-    name: "services-stubs",
+    name: "android_system_server_stubs_current",
     srcs: [":services-stubs.sources"],
     installable: false,
+    static_libs: ["android_module_lib_stubs_current"],
 }

services/core/Android.bp

@@ -91,7 +91,7 @@ java_library_static {
     ],
 
     libs: [
-        "services-stubs",
+        "android_system_server_stubs_current",
         "services.net",
         "android.hardware.light-V2.0-java",
         "android.hardware.power-java",