Merge changes I8fd2a3c9,Id08058f3 am: 49c52979ba am: d95ae9b3ac

Change-Id: Icec474a4eb710e0c0f80d50ffff780e3ad6699ae

libprocessgroup/Android.bp

@@ -13,6 +13,10 @@ cc_library_headers {
             enabled: true,
         },
     },
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }
 
 cc_library {
@@ -52,4 +56,8 @@ cc_library {
         "-Werror",
         "-Wexit-time-destructors",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }

libstats/push_compat/Android.bp

@@ -49,6 +49,7 @@ cc_library {
         "libstatssocket_headers",
     ],
     static_libs: ["libgtest_prod"],
+    apex_available: ["com.android.resolv"],
 }
 
 cc_test {

libstats/socket/Android.bp

@@ -85,6 +85,7 @@ cc_library_headers {
     name: "libstatssocket_headers",
     export_include_dirs: ["include"],
     host_supported: true,
+    apex_available: ["com.android.resolv"],
 }
 
 cc_benchmark {