diff --git a/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump b/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
index e161a6b..3081ac7 100644
--- a/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -467,6 +467,9 @@
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_isUpdatableViaApex"
+  },
+  {
    "name" : "AServiceManager_reRegister"
   },
   {
@@ -543,7 +546,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:40:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:43:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -663,7 +666,7 @@
     }
    ],
    "linker_set_key" : "_ZTI19$FLAG_PRIVATE_LOCAL",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:62:1)",
    "referenced_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "self_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "size" : 4,
@@ -790,7 +793,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:52:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:58:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -7767,6 +7770,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_isUpdatableViaApex",
+   "linker_set_key" : "AServiceManager_isUpdatableViaApex",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_reRegister",
    "linker_set_key" : "AServiceManager_reRegister",
    "return_type" : "_ZTIv",
diff --git a/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump b/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
index 963f8d9..1c35866 100644
--- a/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
@@ -467,6 +467,9 @@
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_isUpdatableViaApex"
+  },
+  {
    "name" : "AServiceManager_reRegister"
   },
   {
@@ -543,7 +546,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:40:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:43:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -663,7 +666,7 @@
     }
    ],
    "linker_set_key" : "_ZTI19$FLAG_PRIVATE_LOCAL",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:62:1)",
    "referenced_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "self_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "size" : 4,
@@ -790,7 +793,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:52:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:58:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -7767,6 +7770,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_isUpdatableViaApex",
+   "linker_set_key" : "AServiceManager_isUpdatableViaApex",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_reRegister",
    "linker_set_key" : "AServiceManager_reRegister",
    "return_type" : "_ZTIv",
diff --git a/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump b/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
index 963f8d9..1c35866 100644
--- a/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -467,6 +467,9 @@
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_isUpdatableViaApex"
+  },
+  {
    "name" : "AServiceManager_reRegister"
   },
   {
@@ -543,7 +546,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:40:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:43:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -663,7 +666,7 @@
     }
    ],
    "linker_set_key" : "_ZTI19$FLAG_PRIVATE_LOCAL",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:62:1)",
    "referenced_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "self_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "size" : 4,
@@ -790,7 +793,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:52:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:58:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -7767,6 +7770,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_isUpdatableViaApex",
+   "linker_set_key" : "AServiceManager_isUpdatableViaApex",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_reRegister",
    "linker_set_key" : "AServiceManager_reRegister",
    "return_type" : "_ZTIv",
diff --git a/S/64/x86/source-based/libbinder_ndk.so.lsdump b/S/64/x86/source-based/libbinder_ndk.so.lsdump
index 963d737..b9396d5 100644
--- a/S/64/x86/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86/source-based/libbinder_ndk.so.lsdump
@@ -466,6 +466,9 @@
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_isUpdatableViaApex"
+  },
+  {
    "name" : "AServiceManager_reRegister"
   },
   {
@@ -542,7 +545,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:40:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:43:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -662,7 +665,7 @@
     }
    ],
    "linker_set_key" : "_ZTI19$FLAG_PRIVATE_LOCAL",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:62:1)",
    "referenced_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "self_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "size" : 4,
@@ -789,7 +792,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:52:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:58:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -7766,6 +7769,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_isUpdatableViaApex",
+   "linker_set_key" : "AServiceManager_isUpdatableViaApex",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_reRegister",
    "linker_set_key" : "AServiceManager_reRegister",
    "return_type" : "_ZTIv",
diff --git a/S/64/x86_64/source-based/libbinder_ndk.so.lsdump b/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
index 9c7a552..ce375a9 100644
--- a/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
@@ -466,6 +466,9 @@
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_isUpdatableViaApex"
+  },
+  {
    "name" : "AServiceManager_reRegister"
   },
   {
@@ -542,7 +545,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:40:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:43:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -662,7 +665,7 @@
     }
    ],
    "linker_set_key" : "_ZTI19$FLAG_PRIVATE_LOCAL",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:62:1)",
    "referenced_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "self_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "size" : 4,
@@ -789,7 +792,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:52:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:58:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -7766,6 +7769,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_isUpdatableViaApex",
+   "linker_set_key" : "AServiceManager_isUpdatableViaApex",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_reRegister",
    "linker_set_key" : "AServiceManager_reRegister",
    "return_type" : "_ZTIv",
diff --git a/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump b/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
index 963d737..b9396d5 100644
--- a/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
@@ -466,6 +466,9 @@
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_isUpdatableViaApex"
+  },
+  {
    "name" : "AServiceManager_reRegister"
   },
   {
@@ -542,7 +545,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:40:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:43:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -662,7 +665,7 @@
     }
    ],
    "linker_set_key" : "_ZTI19$FLAG_PRIVATE_LOCAL",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h:62:1)",
    "referenced_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "self_type" : "_ZTI19$FLAG_PRIVATE_LOCAL",
    "size" : 4,
@@ -789,7 +792,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:52:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:58:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -7766,6 +7769,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_isUpdatableViaApex",
+   "linker_set_key" : "AServiceManager_isUpdatableViaApex",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_reRegister",
    "linker_set_key" : "AServiceManager_reRegister",
    "return_type" : "_ZTIv",