Merge "Use the R API statsd library on R NetworkStack" into rvc-dev

Android.bp

@@ -128,7 +128,7 @@ android_library {
     defaults: ["NetworkStackReleaseApiLevel"],
     srcs: [
         "src/**/*.java",
-        ":statslog-networkstack-java-gen-q",
+        ":statslog-networkstack-java-gen",
     ],
     // API stable uses a jarjared version of the shims
     static_libs: [
@@ -253,15 +253,6 @@ cc_library_shared {
     ],
 }
 
-genrule {
-    name: "statslog-networkstack-java-gen-q",
-    tools: ["stats-log-api-gen"],
-    cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +
-         " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +
-         " --compileQ",
-    out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],
-}
-
 genrule {
     name: "statslog-networkstack-java-gen",
     tools: ["stats-log-api-gen"],