Revert^2 "Delete atoms.proto from statsd"

217301c36f7ffd500441cb879a4fa88b770092db

Change-Id: I81a8287ed5b055e7b6547794d01e7ac897f0f022
diff --git a/Android.bp b/Android.bp
index 8164d6a..d9fe7cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -912,13 +912,17 @@
     name: "platformprotos",
     srcs: [
         ":ipconnectivity-proto-src",
+        ":libstats_internal_protos",
         "cmds/am/proto/instrumentation_data.proto",
         "cmds/statsd/src/**/*.proto",
         "core/proto/**/*.proto",
         "libs/incident/proto/**/*.proto",
     ],
     proto: {
-        include_dirs: ["external/protobuf/src"],
+        include_dirs: [
+            "external/protobuf/src",
+            "frameworks/proto_logging/stats",
+        ],
         type: "full",
     },
     // Protos have lots of MissingOverride and similar.