Snap for 12596819 from d40fe621393a922e518a02ed86ee56d6feda0a1c to 25Q1-release

Change-Id: Ic87e7b30f37359509522c7a84159439e3ea852cf
diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index 67a5e37..4167159 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -88,7 +88,6 @@
         "libprocessgroup",
         "libprocessgroup_util",
         "libjsoncpp",
-        "libcgrouprc",
     ],
     include_dirs: ["bionic/libc/kernel"],
     export_include_dirs: ["include"],
@@ -132,7 +131,6 @@
         "libprocessgroup",
         "libprocessgroup_util",
         "libjsoncpp",
-        "libcgrouprc",
         "libsnapuserd_client",
         "libz",
         "liblz4",
@@ -224,7 +222,6 @@
         "libprocessgroup",
         "libprocessgroup_util",
         "libjsoncpp",
-        "libcgrouprc",
         "liburing",
         "libz",
     ],
@@ -319,7 +316,6 @@
         "libsnapuserd",
         "libprocessgroup",
         "libjsoncpp",
-        "libcgrouprc",
         "liburing",
         "libz",
     ],
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 3471de0..1039288 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -279,7 +279,6 @@
     "liblog",
     "libbase",
     "libprocessgroup",
-    "libcgrouprc",
 ]
 
 cc_test {
diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp
index 8448a39..1e76e76 100644
--- a/libprocessgroup/Android.bp
+++ b/libprocessgroup/Android.bp
@@ -110,7 +110,6 @@
     ],
     shared_libs: [
         "libbase",
-        "libcgrouprc",
         "libprocessgroup",
     ],
     static_libs: [
diff --git a/libprocessgroup/setup/Android.bp b/libprocessgroup/setup/Android.bp
index cc6c67c..25737f5 100644
--- a/libprocessgroup/setup/Android.bp
+++ b/libprocessgroup/setup/Android.bp
@@ -29,7 +29,6 @@
     ],
     shared_libs: [
         "libbase",
-        "libcgrouprc",
         "libjsoncpp",
     ],
     static_libs: [