diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
index 13e716a..0ba2c3e 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so
index 05a0b23..601f614 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h b/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
index 4237e8c..c2c79dd 100644
--- a/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
+++ b/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
@@ -789,6 +789,7 @@
 constexpr char KEY_MAX_FPS_TO_ENCODER[] = "max-fps-to-encoder";
 constexpr char KEY_MAX_HEIGHT[] = "max-height";
 constexpr char KEY_MAX_INPUT_SIZE[] = "max-input-size";
+constexpr char KEY_MAX_OUTPUT_CHANNEL_COUNT[] = "max-output-channel-count";
 constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";
 constexpr char KEY_MAX_WIDTH[] = "max-width";
 constexpr char KEY_MIME[] = "mime";
diff --git a/arm/include/frameworks/native/cmds/dumpstate/dumpstate.h b/arm/include/frameworks/native/cmds/dumpstate/dumpstate.h
index 83e6787..34280d0 100644
--- a/arm/include/frameworks/native/cmds/dumpstate/dumpstate.h
+++ b/arm/include/frameworks/native/cmds/dumpstate/dumpstate.h
@@ -642,6 +642,9 @@
 /* Prints the contents of all the routing tables, both IPv4 and IPv6. */
 void dump_route_tables();
 
+/* Dump subdirectories of cgroupfs if the corresponding process is frozen */
+void dump_frozen_cgroupfs();
+
 /* Play a sound via Stagefright */
 void play_sound(const char *path);
 
diff --git a/arm/include/system/core/libprocessgroup/include/processgroup/processgroup.h b/arm/include/system/core/libprocessgroup/include/processgroup/processgroup.h
index fa2642d..50416fa 100644
--- a/arm/include/system/core/libprocessgroup/include/processgroup/processgroup.h
+++ b/arm/include/system/core/libprocessgroup/include/processgroup/processgroup.h
@@ -34,6 +34,8 @@
 
 #ifndef __ANDROID_VNDK__
 
+bool SetProcessProfilesCached(uid_t uid, pid_t pid, const std::vector<std::string>& profiles);
+
 static constexpr const char* CGROUPS_RC_PATH = "/dev/cgroup_info/cgroup.rc";
 
 bool UsePerAppMemcg();
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so
index db41c56..d2a4a5a 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libprocessgroup.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libprocessgroup.so
index 180942a..221895d 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libprocessgroup.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so
index f0fac15..86c8163 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libprocessgroup.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libprocessgroup.so
index 615f2ed..e5a307f 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libprocessgroup.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h b/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
index 4237e8c..c2c79dd 100644
--- a/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
+++ b/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
@@ -789,6 +789,7 @@
 constexpr char KEY_MAX_FPS_TO_ENCODER[] = "max-fps-to-encoder";
 constexpr char KEY_MAX_HEIGHT[] = "max-height";
 constexpr char KEY_MAX_INPUT_SIZE[] = "max-input-size";
+constexpr char KEY_MAX_OUTPUT_CHANNEL_COUNT[] = "max-output-channel-count";
 constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";
 constexpr char KEY_MAX_WIDTH[] = "max-width";
 constexpr char KEY_MIME[] = "mime";
diff --git a/arm64/include/frameworks/native/cmds/dumpstate/dumpstate.h b/arm64/include/frameworks/native/cmds/dumpstate/dumpstate.h
index 83e6787..34280d0 100644
--- a/arm64/include/frameworks/native/cmds/dumpstate/dumpstate.h
+++ b/arm64/include/frameworks/native/cmds/dumpstate/dumpstate.h
@@ -642,6 +642,9 @@
 /* Prints the contents of all the routing tables, both IPv4 and IPv6. */
 void dump_route_tables();
 
+/* Dump subdirectories of cgroupfs if the corresponding process is frozen */
+void dump_frozen_cgroupfs();
+
 /* Play a sound via Stagefright */
 void play_sound(const char *path);
 
diff --git a/arm64/include/system/core/libprocessgroup/include/processgroup/processgroup.h b/arm64/include/system/core/libprocessgroup/include/processgroup/processgroup.h
index fa2642d..50416fa 100644
--- a/arm64/include/system/core/libprocessgroup/include/processgroup/processgroup.h
+++ b/arm64/include/system/core/libprocessgroup/include/processgroup/processgroup.h
@@ -34,6 +34,8 @@
 
 #ifndef __ANDROID_VNDK__
 
+bool SetProcessProfilesCached(uid_t uid, pid_t pid, const std::vector<std::string>& profiles);
+
 static constexpr const char* CGROUPS_RC_PATH = "/dev/cgroup_info/cgroup.rc";
 
 bool UsePerAppMemcg();
diff --git a/x86/arch-x86/shared/vndk-sp/libcutils.so b/x86/arch-x86/shared/vndk-sp/libcutils.so
index cb9b7c2..3c1e829 100755
--- a/x86/arch-x86/shared/vndk-sp/libcutils.so
+++ b/x86/arch-x86/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/x86/arch-x86/shared/vndk-sp/libprocessgroup.so b/x86/arch-x86/shared/vndk-sp/libprocessgroup.so
index 3b81b76..e9c2348 100755
--- a/x86/arch-x86/shared/vndk-sp/libprocessgroup.so
+++ b/x86/arch-x86/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h b/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
index 4237e8c..c2c79dd 100644
--- a/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
+++ b/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
@@ -789,6 +789,7 @@
 constexpr char KEY_MAX_FPS_TO_ENCODER[] = "max-fps-to-encoder";
 constexpr char KEY_MAX_HEIGHT[] = "max-height";
 constexpr char KEY_MAX_INPUT_SIZE[] = "max-input-size";
+constexpr char KEY_MAX_OUTPUT_CHANNEL_COUNT[] = "max-output-channel-count";
 constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";
 constexpr char KEY_MAX_WIDTH[] = "max-width";
 constexpr char KEY_MIME[] = "mime";
diff --git a/x86/include/frameworks/native/cmds/dumpstate/dumpstate.h b/x86/include/frameworks/native/cmds/dumpstate/dumpstate.h
index 83e6787..34280d0 100644
--- a/x86/include/frameworks/native/cmds/dumpstate/dumpstate.h
+++ b/x86/include/frameworks/native/cmds/dumpstate/dumpstate.h
@@ -642,6 +642,9 @@
 /* Prints the contents of all the routing tables, both IPv4 and IPv6. */
 void dump_route_tables();
 
+/* Dump subdirectories of cgroupfs if the corresponding process is frozen */
+void dump_frozen_cgroupfs();
+
 /* Play a sound via Stagefright */
 void play_sound(const char *path);
 
diff --git a/x86/include/system/core/libprocessgroup/include/processgroup/processgroup.h b/x86/include/system/core/libprocessgroup/include/processgroup/processgroup.h
index fa2642d..50416fa 100644
--- a/x86/include/system/core/libprocessgroup/include/processgroup/processgroup.h
+++ b/x86/include/system/core/libprocessgroup/include/processgroup/processgroup.h
@@ -34,6 +34,8 @@
 
 #ifndef __ANDROID_VNDK__
 
+bool SetProcessProfilesCached(uid_t uid, pid_t pid, const std::vector<std::string>& profiles);
+
 static constexpr const char* CGROUPS_RC_PATH = "/dev/cgroup_info/cgroup.rc";
 
 bool UsePerAppMemcg();
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so
index a83f1a8..e23a7ef 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libprocessgroup.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libprocessgroup.so
index b3b11b2..7021dc1 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libprocessgroup.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-sp/libcutils.so b/x86_64/arch-x86_64/shared/vndk-sp/libcutils.so
index 6c7a561..f9c0e3d 100755
--- a/x86_64/arch-x86_64/shared/vndk-sp/libcutils.so
+++ b/x86_64/arch-x86_64/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-sp/libprocessgroup.so b/x86_64/arch-x86_64/shared/vndk-sp/libprocessgroup.so
index 3918931..b662b75 100755
--- a/x86_64/arch-x86_64/shared/vndk-sp/libprocessgroup.so
+++ b/x86_64/arch-x86_64/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h b/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
index 4237e8c..c2c79dd 100644
--- a/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
+++ b/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
@@ -789,6 +789,7 @@
 constexpr char KEY_MAX_FPS_TO_ENCODER[] = "max-fps-to-encoder";
 constexpr char KEY_MAX_HEIGHT[] = "max-height";
 constexpr char KEY_MAX_INPUT_SIZE[] = "max-input-size";
+constexpr char KEY_MAX_OUTPUT_CHANNEL_COUNT[] = "max-output-channel-count";
 constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";
 constexpr char KEY_MAX_WIDTH[] = "max-width";
 constexpr char KEY_MIME[] = "mime";
diff --git a/x86_64/include/frameworks/native/cmds/dumpstate/dumpstate.h b/x86_64/include/frameworks/native/cmds/dumpstate/dumpstate.h
index 83e6787..34280d0 100644
--- a/x86_64/include/frameworks/native/cmds/dumpstate/dumpstate.h
+++ b/x86_64/include/frameworks/native/cmds/dumpstate/dumpstate.h
@@ -642,6 +642,9 @@
 /* Prints the contents of all the routing tables, both IPv4 and IPv6. */
 void dump_route_tables();
 
+/* Dump subdirectories of cgroupfs if the corresponding process is frozen */
+void dump_frozen_cgroupfs();
+
 /* Play a sound via Stagefright */
 void play_sound(const char *path);
 
diff --git a/x86_64/include/system/core/libprocessgroup/include/processgroup/processgroup.h b/x86_64/include/system/core/libprocessgroup/include/processgroup/processgroup.h
index fa2642d..50416fa 100644
--- a/x86_64/include/system/core/libprocessgroup/include/processgroup/processgroup.h
+++ b/x86_64/include/system/core/libprocessgroup/include/processgroup/processgroup.h
@@ -34,6 +34,8 @@
 
 #ifndef __ANDROID_VNDK__
 
+bool SetProcessProfilesCached(uid_t uid, pid_t pid, const std::vector<std::string>& profiles);
+
 static constexpr const char* CGROUPS_RC_PATH = "/dev/cgroup_info/cgroup.rc";
 
 bool UsePerAppMemcg();