Merge "Statically link libbase for mainline module tests" into main

netd/Android.bp

@@ -69,10 +69,10 @@ cc_test {
         "BpfBaseTest.cpp"
     ],
     static_libs: [
+        "libbase",
         "libnetd_updatable",
     ],
     shared_libs: [
-        "libbase",
         "libcutils",
         "liblog",
         "libnetdutils",

service-t/native/libs/libnetworkstats/Android.bp

@@ -73,6 +73,7 @@ cc_test {
         "-Wthread-safety",
     ],
     static_libs: [
+        "libbase",
         "libgmock",
         "libnetworkstats",
         "libperfetto_client_experimental",
@@ -80,7 +81,6 @@ cc_test {
         "perfetto_trace_protos",
     ],
     shared_libs: [
-        "libbase",
         "liblog",
         "libcutils",
         "libandroid_net",