Rename module lib stubs to 'android'

android.jar is the historical name of the framework stubs, so stick
with that.

Exempt-From-Owner-Approval: comment-only changes irrelvant to statsd team
Test: m
Change-Id: I1ef40b0e426c51d697f1efdabdc87096555e26e8

StubLibraries.bp

@@ -340,7 +340,7 @@ java_library_static {
 }
 
 java_library_static {
-    name: "framework_module_app_stubs_current",
+    name: "android_module_app_stubs_current",
     srcs: [
         ":module-app-api-stubs-docs",
     ],
@@ -355,7 +355,7 @@ java_library_static {
 }
 
 java_library_static {
-    name: "framework_module_lib_stubs_current",
+    name: "android_module_lib_stubs_current",
     srcs: [
         ":module-lib-api-stubs-docs",
     ],

apex/statsd/framework/Android.bp

@@ -34,9 +34,8 @@ java_library {
     ],
     libs: [
         "framework-annotations-lib",
-        // TODO(b/146230220): Use framework-system-stubs instead.
-        //"android_system_stubs_current",
-        //"framework_module_lib_stubs_current",
+        // TODO(b/146230220): Use android_module_lib_stubs_current instead.
+        //"android_module_lib_stubs_current",
         "framework-all",
     ],
     hostdex: true, // for hiddenapi check