Snap for 6664334 from 333f3c1db96e0e0648e73b383a893ec6c29dbbd0 to rvc-release

Change-Id: I1ea48133f32324b6bf3cddde89952e1383e3e72c

Android.bp

diff --git a/Android.bp b/Android.bp
index ae19a1c..37e001c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -128,7 +128,7 @@
     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: [
@@ -254,15 +254,6 @@
 }
 
 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"],
     cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +