diff --git a/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump b/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
index 5dce7d8..734517b 100644
--- a/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -146,6 +146,9 @@
    "name" : "AIBinder_Class_define"
   },
   {
+   "name" : "AIBinder_Class_setHandleShellCommand"
+  },
+  {
    "name" : "AIBinder_Class_setOnDump"
   },
   {
@@ -3460,6 +3463,36 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "name" : "int (AIBinder *, int, int, int, const char **, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8AIBinder"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "parameters" :
@@ -5847,6 +5880,21 @@
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
+   "function_name" : "AIBinder_Class_setHandleShellCommand",
+   "linker_set_key" : "AIBinder_Class_setHandleShellCommand",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP14AIBinder_Class"
+    },
+    {
+     "referenced_type" : "_ZTIPFiP8AIBinderiiiPPKcjE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
    "function_name" : "AIBinder_Class_setOnDump",
    "linker_set_key" : "AIBinder_Class_setOnDump",
    "parameters" :
@@ -8793,6 +8841,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "name" : "int (*)(AIBinder *, int, int, int, const char **, unsigned int)",
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
@@ -10223,7 +10280,7 @@
    "name" : "const AIBinder_Class",
    "referenced_type" : "_ZTI14AIBinder_Class",
    "self_type" : "_ZTIK14AIBinder_Class",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
diff --git a/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump b/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
index 6053c1b..d1059c4 100644
--- a/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
@@ -50,14 +50,6 @@
    "size" : 8
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIe",
-   "name" : "long double",
-   "referenced_type" : "_ZTIe",
-   "self_type" : "_ZTIe",
-   "size" : 8
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
@@ -95,25 +87,6 @@
    "size" : 4
   },
   {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIl",
-   "name" : "long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIl",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIm",
-   "name" : "unsigned long",
-   "referenced_type" : "_ZTIm",
-   "self_type" : "_ZTIm",
-   "size" : 4
-  },
-  {
    "alignment" : 2,
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
@@ -173,6 +146,9 @@
    "name" : "AIBinder_Class_define"
   },
   {
+   "name" : "AIBinder_Class_setHandleShellCommand"
+  },
+  {
    "name" : "AIBinder_Class_setOnDump"
   },
   {
@@ -3487,6 +3463,36 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "name" : "int (AIBinder *, int, int, int, const char **, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8AIBinder"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "parameters" :
@@ -5874,6 +5880,21 @@
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
+   "function_name" : "AIBinder_Class_setHandleShellCommand",
+   "linker_set_key" : "AIBinder_Class_setHandleShellCommand",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP14AIBinder_Class"
+    },
+    {
+     "referenced_type" : "_ZTIPFiP8AIBinderiiiPPKcjE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
    "function_name" : "AIBinder_Class_setOnDump",
    "linker_set_key" : "AIBinder_Class_setOnDump",
    "parameters" :
@@ -8820,6 +8841,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "name" : "int (*)(AIBinder *, int, int, int, const char **, unsigned int)",
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
@@ -9713,8 +9743,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9767,8 +9797,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:",
-   "self_type" : "_ZTIPK7AParcel#ODR:",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9794,8 +9824,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:",
-   "self_type" : "_ZTIPK7AStatus#ODR:",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9821,8 +9851,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:",
-   "self_type" : "_ZTIPK8AIBinder#ODR:",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9956,8 +9986,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:",
-   "self_type" : "_ZTIPP7AParcel#ODR:",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9974,8 +10004,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:",
-   "self_type" : "_ZTIPP7AStatus#ODR:",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10010,8 +10040,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:",
-   "self_type" : "_ZTIPP8AIBinder#ODR:",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10250,7 +10280,7 @@
    "name" : "const AIBinder_Class",
    "referenced_type" : "_ZTI14AIBinder_Class",
    "self_type" : "_ZTIK14AIBinder_Class",
-   "size" : 20,
+   "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
diff --git a/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump b/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
index 99bfc48..3e5c5d8 100644
--- a/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -50,14 +50,6 @@
    "size" : 8
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIe",
-   "name" : "long double",
-   "referenced_type" : "_ZTIe",
-   "self_type" : "_ZTIe",
-   "size" : 8
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
@@ -95,25 +87,6 @@
    "size" : 4
   },
   {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIl",
-   "name" : "long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIl",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIm",
-   "name" : "unsigned long",
-   "referenced_type" : "_ZTIm",
-   "self_type" : "_ZTIm",
-   "size" : 4
-  },
-  {
    "alignment" : 2,
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
@@ -173,6 +146,9 @@
    "name" : "AIBinder_Class_define"
   },
   {
+   "name" : "AIBinder_Class_setHandleShellCommand"
+  },
+  {
    "name" : "AIBinder_Class_setOnDump"
   },
   {
@@ -3487,6 +3463,36 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "name" : "int (AIBinder *, int, int, int, const char **, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8AIBinder"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "parameters" :
@@ -5874,6 +5880,21 @@
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
+   "function_name" : "AIBinder_Class_setHandleShellCommand",
+   "linker_set_key" : "AIBinder_Class_setHandleShellCommand",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP14AIBinder_Class"
+    },
+    {
+     "referenced_type" : "_ZTIPFiP8AIBinderiiiPPKcjE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
    "function_name" : "AIBinder_Class_setOnDump",
    "linker_set_key" : "AIBinder_Class_setOnDump",
    "parameters" :
@@ -8820,6 +8841,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "name" : "int (*)(AIBinder *, int, int, int, const char **, unsigned int)",
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
@@ -9713,8 +9743,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:",
-   "self_type" : "_ZTIPK14AIBinder_Class#ODR:",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9767,8 +9797,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "_ZTIK7AParcel#ODR:",
-   "self_type" : "_ZTIPK7AParcel#ODR:",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9794,8 +9824,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "_ZTIK7AStatus#ODR:",
-   "self_type" : "_ZTIPK7AStatus#ODR:",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9821,8 +9851,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "_ZTIK8AIBinder#ODR:",
-   "self_type" : "_ZTIPK8AIBinder#ODR:",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9956,8 +9986,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "_ZTIP7AParcel#ODR:",
-   "self_type" : "_ZTIPP7AParcel#ODR:",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9974,8 +10004,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "_ZTIP7AStatus#ODR:",
-   "self_type" : "_ZTIPP7AStatus#ODR:",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10010,8 +10040,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "_ZTIP8AIBinder#ODR:",
-   "self_type" : "_ZTIPP8AIBinder#ODR:",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10250,7 +10280,7 @@
    "name" : "const AIBinder_Class",
    "referenced_type" : "_ZTI14AIBinder_Class",
    "self_type" : "_ZTIK14AIBinder_Class",
-   "size" : 20,
+   "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
diff --git a/R/64/x86/source-based/libbinder_ndk.so.lsdump b/R/64/x86/source-based/libbinder_ndk.so.lsdump
index ce08139..5eac3ac 100644
--- a/R/64/x86/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/x86/source-based/libbinder_ndk.so.lsdump
@@ -145,6 +145,9 @@
    "name" : "AIBinder_Class_define"
   },
   {
+   "name" : "AIBinder_Class_setHandleShellCommand"
+  },
+  {
    "name" : "AIBinder_Class_setOnDump"
   },
   {
@@ -3459,6 +3462,36 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "name" : "int (AIBinder *, int, int, int, const char **, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8AIBinder"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "parameters" :
@@ -5846,6 +5879,21 @@
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
+   "function_name" : "AIBinder_Class_setHandleShellCommand",
+   "linker_set_key" : "AIBinder_Class_setHandleShellCommand",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP14AIBinder_Class"
+    },
+    {
+     "referenced_type" : "_ZTIPFiP8AIBinderiiiPPKcjE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
    "function_name" : "AIBinder_Class_setOnDump",
    "linker_set_key" : "AIBinder_Class_setOnDump",
    "parameters" :
@@ -8792,6 +8840,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "name" : "int (*)(AIBinder *, int, int, int, const char **, unsigned int)",
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
@@ -10222,7 +10279,7 @@
    "name" : "const AIBinder_Class",
    "referenced_type" : "_ZTI14AIBinder_Class",
    "self_type" : "_ZTIK14AIBinder_Class",
-   "size" : 20,
+   "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
diff --git a/R/64/x86_64/source-based/libbinder_ndk.so.lsdump b/R/64/x86_64/source-based/libbinder_ndk.so.lsdump
index 9d0f3ae..80961f6 100644
--- a/R/64/x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/x86_64/source-based/libbinder_ndk.so.lsdump
@@ -145,6 +145,9 @@
    "name" : "AIBinder_Class_define"
   },
   {
+   "name" : "AIBinder_Class_setHandleShellCommand"
+  },
+  {
    "name" : "AIBinder_Class_setOnDump"
   },
   {
@@ -3459,6 +3462,36 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "name" : "int (AIBinder *, int, int, int, const char **, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8AIBinder"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "parameters" :
@@ -5846,6 +5879,21 @@
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
+   "function_name" : "AIBinder_Class_setHandleShellCommand",
+   "linker_set_key" : "AIBinder_Class_setHandleShellCommand",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP14AIBinder_Class"
+    },
+    {
+     "referenced_type" : "_ZTIPFiP8AIBinderiiiPPKcjE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
    "function_name" : "AIBinder_Class_setOnDump",
    "linker_set_key" : "AIBinder_Class_setOnDump",
    "parameters" :
@@ -8801,6 +8849,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "name" : "int (*)(AIBinder *, int, int, int, const char **, unsigned int)",
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
@@ -10231,7 +10288,7 @@
    "name" : "const AIBinder_Class",
    "referenced_type" : "_ZTI14AIBinder_Class",
    "self_type" : "_ZTIK14AIBinder_Class",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
diff --git a/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump b/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
index c77baf0..5dbdad4 100644
--- a/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
@@ -145,6 +145,9 @@
    "name" : "AIBinder_Class_define"
   },
   {
+   "name" : "AIBinder_Class_setHandleShellCommand"
+  },
+  {
    "name" : "AIBinder_Class_setOnDump"
   },
   {
@@ -3459,6 +3462,36 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "name" : "int (AIBinder *, int, int, int, const char **, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8AIBinder"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "parameters" :
@@ -5846,6 +5879,21 @@
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
+   "function_name" : "AIBinder_Class_setHandleShellCommand",
+   "linker_set_key" : "AIBinder_Class_setHandleShellCommand",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP14AIBinder_Class"
+    },
+    {
+     "referenced_type" : "_ZTIPFiP8AIBinderiiiPPKcjE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
    "function_name" : "AIBinder_Class_setOnDump",
    "linker_set_key" : "AIBinder_Class_setOnDump",
    "parameters" :
@@ -8792,6 +8840,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "name" : "int (*)(AIBinder *, int, int, int, const char **, unsigned int)",
+   "referenced_type" : "_ZTIFiP8AIBinderiiiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiiiPPKcjE",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_shell.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
    "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
@@ -10222,7 +10279,7 @@
    "name" : "const AIBinder_Class",
    "referenced_type" : "_ZTI14AIBinder_Class",
    "self_type" : "_ZTIK14AIBinder_Class",
-   "size" : 20,
+   "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {