Merge "Build FrameworkStatsdTest test against the sdk" into rvc-dev

apex/statsd/framework/Android.bp

@@ -166,10 +166,8 @@ java_library {
 
 android_test {
     name: "FrameworkStatsdTest",
-    platform_apis: true,
+    sdk_version: "module_current",
     srcs: [
-        // TODO(b/147705194): Use framework-statsd as a lib dependency instead.
-        ":framework-statsd-sources",
         "test/**/*.java",
     ],
     manifest: "test/AndroidManifest.xml",
@@ -180,6 +178,7 @@ android_test {
     libs: [
         "android.test.runner.stubs",
         "android.test.base.stubs",
+        "framework-statsd",
     ],
     test_suites: [
         "device-tests",