Snap for 12901447 from 05d34b8ece66eff9cd96cdaa231a5fd345b4f92c to simpleperf-release

Change-Id: I198da02b47321cf285db09b8c43326ca64909ce2

OWNERS

diff --git a/OWNERS b/OWNERS
index e6227e0..e61acdd 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,2 @@
 include platform/frameworks/base:/SQLITE_OWNERS
+include platform/system/core:/janitors/OWNERS #{LAST_RESORT_SUGGESTION}

dist/Android.bp

diff --git a/dist/Android.bp b/dist/Android.bp
index e6f349e..38fe2bc 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -216,7 +216,6 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.os.statsd",
-        "test_com.android.os.statsd",
     ],
     min_sdk_version: "apex_inherit",
     host_supported: true,