diff --git a/prebuilts/samsung/r0qxxx/.current b/prebuilts/samsung/r0qxxx/.current
index d955277a75..4149598c0a 100644
--- a/prebuilts/samsung/r0qxxx/.current
+++ b/prebuilts/samsung/r0qxxx/.current
@@ -1 +1 @@
-S901EXXSCEYC1/S901EOXMCEYC1/S901EXXSCEYC1
\ No newline at end of file
+S901EXXSDGZB6/S901EOXMDGZB6/S901EXXSDGZB6
\ No newline at end of file
diff --git a/prebuilts/samsung/r0qxxx/system_ext/apex/com.android.vndk.v31.apex b/prebuilts/samsung/r0qxxx/system_ext/apex/com.android.vndk.v31.apex
index b818dd9de2..6d3a77cda5 100644
Binary files a/prebuilts/samsung/r0qxxx/system_ext/apex/com.android.vndk.v31.apex and b/prebuilts/samsung/r0qxxx/system_ext/apex/com.android.vndk.v31.apex differ