Merge "Add cc_defaults containing libs needed for static linking" into main

tools/aconfig/aconfig/templates/cpp_source_file.template

@@ -3,7 +3,6 @@
 {{ if allow_instrumentation }}
 #include <sys/stat.h>
 #include "aconfig_storage/aconfig_storage_read_api.hpp"
-#include <protos/aconfig_storage_metadata.pb.h>
 #include <android/log.h>
 
 #define ALOGI(msg, ...)                                                        \

tools/aconfig/aconfig_storage_read_api/Android.bp

@@ -109,3 +109,11 @@ cc_library {
     },
     double_loadable: true,
 }
+
+cc_defaults {
+    name: "aconfig_lib_cc_static_link.defaults",
+    shared_libs: [
+        "libaconfig_storage_read_api_cc",
+        "liblog",
+    ],
+}