Snap for 8953554 from 2dd816ae5ed12ebe08e90bb928aa5562ab61d310 to mainline-tzdata4-release

Change-Id: Ia480ae803dd639b6c693c50b847b2975912d06fb
diff --git a/33/64/arm/source-based/android.hardware.camera.device-V1-ndk.so.lsdump b/33/64/arm/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
index fbecab1..7abc54d 100644
--- a/33/64/arm/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
+++ b/33/64/arm/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
@@ -7111,7 +7111,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7127,7 +7127,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7916,7 +7916,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device22BpCameraOfflineSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8551,7 +8551,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8567,7 +8567,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8830,7 +8830,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device28ICameraOfflineSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -9039,7 +9039,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv7-a-neon_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPK7AParcel"
diff --git a/33/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump b/33/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 5702c7c..d086597 100644
--- a/33/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/33/64/arm/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -340,7 +340,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 1,
@@ -367,7 +367,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -428,7 +428,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -805,11 +805,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -826,11 +826,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -960,11 +960,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3178,7 +3178,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3196,7 +3196,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3217,7 +3217,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3301,7 +3301,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5028,7 +5028,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -5037,7 +5037,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5073,7 +5073,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -5091,7 +5091,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -5127,7 +5127,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5145,7 +5145,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5190,7 +5190,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5199,7 +5199,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5208,7 +5208,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5253,7 +5253,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5307,7 +5307,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -6405,7 +6405,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -7918,7 +7918,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -7958,7 +7958,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9590,7 +9590,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9630,7 +9630,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9818,7 +9818,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9868,7 +9868,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9878,7 +9878,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9888,7 +9888,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9898,7 +9898,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10182,7 +10182,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10219,7 +10219,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -10249,7 +10249,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10311,7 +10311,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10388,7 +10388,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10460,7 +10460,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10476,7 +10476,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10524,7 +10524,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10566,7 +10566,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10603,7 +10603,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10650,7 +10650,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10697,7 +10697,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -10851,7 +10851,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -10937,7 +10937,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10958,7 +10958,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -10994,7 +10994,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -11146,7 +11146,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -11308,7 +11308,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -11324,7 +11324,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -11345,7 +11345,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11402,7 +11402,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11423,7 +11423,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11510,7 +11510,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -11592,7 +11592,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -11736,7 +11736,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -11757,7 +11757,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11773,7 +11773,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -11794,7 +11794,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -11876,7 +11876,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -11892,7 +11892,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -11922,7 +11922,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -11938,7 +11938,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -12248,12 +12248,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -12299,7 +12299,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -15094,12 +15094,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15117,11 +15117,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15138,12 +15138,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/arm/source-based/config.ini b/33/64/arm/source-based/config.ini
deleted file mode 100644
index a3a2a44..0000000
--- a/33/64/arm/source-based/config.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-allow_adding_removing_weak_symbols = true
diff --git a/33/64/arm/source-based/libRSCpuRef.so.lsdump b/33/64/arm/source-based/libRSCpuRef.so.lsdump
index c418d75..e7cb8f4 100644
--- a/33/64/arm/source-based/libRSCpuRef.so.lsdump
+++ b/33/64/arm/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -214,7 +214,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -394,7 +394,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -520,7 +520,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -700,7 +700,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -743,7 +743,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -4676,7 +4676,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5397,11 +5397,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5716,11 +5716,11 @@
     }
    ],
    "linker_set_key" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/android/dlext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/android/dlext.h:41:1)",
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6081,11 +6081,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6215,11 +6215,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -9246,7 +9246,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9285,7 +9285,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9324,7 +9324,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11637,7 +11637,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11655,7 +11655,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13391,7 +13391,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
+   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
    "source_file" : "frameworks/rs/cpu_ref/rsCpuExecutable.h"
   },
   {
@@ -21881,7 +21881,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -21917,7 +21917,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -22052,7 +22052,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -22061,7 +22061,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -22097,7 +22097,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -22130,8 +22130,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8timespec",
    "name" : "timespec *",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/__threading_support"
   },
@@ -22142,7 +22142,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -22160,7 +22160,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -22250,7 +22250,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22268,7 +22268,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22286,7 +22286,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -23141,7 +23141,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -23150,7 +23150,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -23312,7 +23312,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -23435,8 +23435,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23885,8 +23885,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -26291,7 +26291,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -30215,7 +30215,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -30359,7 +30359,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -30431,7 +30431,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -30612,7 +30612,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -30780,7 +30780,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34403,7 +34403,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -34446,7 +34446,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34716,7 +34716,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34746,7 +34746,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34944,7 +34944,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -34994,7 +34994,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35004,7 +35004,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35014,7 +35014,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35024,7 +35024,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35440,7 +35440,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35742,7 +35742,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -35772,7 +35772,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35834,7 +35834,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36074,7 +36074,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36249,7 +36249,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36265,7 +36265,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36400,7 +36400,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36560,7 +36560,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36627,7 +36627,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -36643,7 +36643,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36848,7 +36848,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36895,7 +36895,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37361,7 +37361,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37452,7 +37452,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -37538,7 +37538,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -37559,7 +37559,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -37595,7 +37595,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -37747,7 +37747,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -37889,7 +37889,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -37910,7 +37910,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38134,7 +38134,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -38165,7 +38165,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -38201,7 +38201,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -38222,7 +38222,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38381,7 +38381,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -38480,7 +38480,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -38498,8 +38498,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -38567,7 +38567,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38588,7 +38588,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -38604,7 +38604,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -38686,7 +38686,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -38702,7 +38702,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -38732,7 +38732,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -38748,7 +38748,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39058,12 +39058,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -39109,7 +39109,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -45353,7 +45353,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45434,7 +45434,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46209,7 +46209,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46226,7 +46226,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46236,7 +46236,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46253,7 +46253,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49813,12 +49813,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49836,11 +49836,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49857,12 +49857,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/arm/source-based/libRSDriver.so.lsdump b/33/64/arm/source-based/libRSDriver.so.lsdump
index 3e37070..3bd5bb5 100644
--- a/33/64/arm/source-based/libRSDriver.so.lsdump
+++ b/33/64/arm/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -295,7 +295,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -322,7 +322,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -511,7 +511,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -538,7 +538,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -563,7 +563,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4562,7 +4562,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5295,11 +5295,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6068,11 +6068,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6244,11 +6244,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8250,7 +8250,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8268,7 +8268,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8307,7 +8307,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10050,7 +10050,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10448,7 +10448,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10472,7 +10472,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11159,7 +11159,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22176,7 +22176,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22193,7 +22193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22216,7 +22216,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22245,7 +22245,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -22259,7 +22259,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22282,7 +22282,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22302,7 +22302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22316,7 +22316,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22330,7 +22330,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22344,7 +22344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIPN9RsdShader13StateBasedKeyE",
@@ -22358,7 +22358,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22387,7 +22387,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22410,7 +22410,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22423,7 +22423,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22440,7 +22440,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22454,7 +22454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPPKc"
@@ -22476,7 +22476,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22495,7 +22495,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22529,7 +22529,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22563,7 +22563,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22576,7 +22576,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22589,7 +22589,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24192,7 +24192,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24345,7 +24345,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -24381,7 +24381,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -24435,7 +24435,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -24462,7 +24462,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24876,7 +24876,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24885,7 +24885,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24903,7 +24903,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25542,7 +25542,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -26313,8 +26313,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -29079,7 +29079,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -29214,7 +29214,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -29313,7 +29313,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -29513,7 +29513,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -31721,7 +31721,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31921,7 +31921,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31931,7 +31931,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32159,7 +32159,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32169,7 +32169,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32179,7 +32179,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32189,7 +32189,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -32307,7 +32307,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -32669,7 +32669,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -32722,7 +32722,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -32752,7 +32752,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -32814,7 +32814,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -33054,7 +33054,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -33356,7 +33356,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33372,7 +33372,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33559,7 +33559,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -33622,7 +33622,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33760,7 +33760,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33926,7 +33926,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -34061,7 +34061,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -34453,7 +34453,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34539,7 +34539,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34591,7 +34591,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -34627,7 +34627,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -34846,7 +34846,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -34867,7 +34867,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35036,7 +35036,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -35057,7 +35057,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35284,7 +35284,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35383,7 +35383,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -35401,8 +35401,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdGL.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/driver/rsdGL.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -35470,7 +35470,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -35491,7 +35491,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35675,7 +35675,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35696,7 +35696,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -35778,7 +35778,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -35794,7 +35794,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -35840,7 +35840,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35856,7 +35856,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36166,12 +36166,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -36217,7 +36217,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "access" : "protected",
@@ -43425,12 +43425,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43448,11 +43448,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -43492,12 +43492,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/arm/source-based/libRS_internal.so.lsdump b/33/64/arm/source-based/libRS_internal.so.lsdump
index a1c1260..9c0562a 100644
--- a/33/64/arm/source-based/libRS_internal.so.lsdump
+++ b/33/64/arm/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -358,7 +358,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -556,7 +556,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -574,7 +574,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -680,7 +680,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_f",
@@ -6130,7 +6130,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7130,11 +7130,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8367,11 +8367,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8543,11 +8543,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8621,11 +8621,11 @@
     }
    ],
    "linker_set_key" : "_ZTI8$SHUT_RD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h:59:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h:59:1)",
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11583,7 +11583,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11601,7 +11601,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11640,7 +11640,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13707,7 +13707,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13764,7 +13764,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -15778,7 +15778,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -16847,7 +16847,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -17118,7 +17118,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -17134,7 +17134,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17151,7 +17151,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17168,7 +17168,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIP13ANativeWindow",
@@ -17196,7 +17196,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript10AllocationE"
@@ -17212,7 +17212,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -17225,7 +17225,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17247,7 +17247,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17269,7 +17269,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17282,7 +17282,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17295,7 +17295,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19803,7 +19803,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21615,7 +21615,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21639,7 +21639,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -22553,7 +22553,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22565,7 +22565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7IStreamE"
@@ -22597,7 +22597,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22613,7 +22613,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22629,7 +22629,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -22651,7 +22651,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22667,7 +22667,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -23708,7 +23708,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -23802,7 +23802,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -27876,7 +27876,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -27895,7 +27895,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -27920,7 +27920,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -27936,7 +27936,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7OStreamE"
@@ -31783,7 +31783,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35449,7 +35449,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35815,7 +35815,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -35860,7 +35860,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36094,7 +36094,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36139,7 +36139,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -36166,7 +36166,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -36202,7 +36202,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36229,7 +36229,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36337,7 +36337,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36346,7 +36346,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36364,7 +36364,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37147,7 +37147,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37174,7 +37174,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37363,7 +37363,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -37603,8 +37603,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37846,8 +37846,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37855,8 +37855,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37864,8 +37864,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37873,8 +37873,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40747,7 +40747,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -40819,7 +40819,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -44995,7 +44995,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -45139,7 +45139,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -45229,7 +45229,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -45350,7 +45350,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45500,7 +45500,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49488,7 +49488,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49565,7 +49565,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *const",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/memory"
@@ -49848,7 +49848,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49858,7 +49858,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49938,7 +49938,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50046,7 +50046,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50096,7 +50096,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50106,7 +50106,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50116,7 +50116,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50126,7 +50126,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50645,7 +50645,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -50933,7 +50933,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "generic",
@@ -51009,7 +51009,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -51039,7 +51039,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51101,7 +51101,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -51341,7 +51341,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -51791,7 +51791,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "encoding",
@@ -52134,7 +52134,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52150,7 +52150,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52378,7 +52378,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52417,7 +52417,7 @@
     {
      "field_name" : "face",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "next",
@@ -52732,7 +52732,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52747,7 +52747,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -52958,7 +52958,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53273,7 +53273,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53394,7 +53394,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -54017,7 +54017,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -54129,7 +54129,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54215,7 +54215,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54267,7 +54267,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54303,7 +54303,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -54455,7 +54455,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -54607,7 +54607,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54623,7 +54623,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -54644,7 +54644,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54665,7 +54665,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54711,7 +54711,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 28,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54961,7 +54961,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54992,7 +54992,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 4,
@@ -55018,7 +55018,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55054,7 +55054,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55075,7 +55075,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55111,7 +55111,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55353,7 +55353,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -55452,7 +55452,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55473,7 +55473,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -55539,7 +55539,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -55560,7 +55560,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -55648,7 +55648,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -55669,7 +55669,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -55751,7 +55751,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -55767,7 +55767,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -55797,7 +55797,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -55813,7 +55813,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56123,12 +56123,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -56174,7 +56174,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56441,12 +56441,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h:74:3)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h:74:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -56464,11 +56464,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_Ut_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h:75:5)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h:75:5)",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -68843,12 +68843,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68866,11 +68866,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68887,12 +68887,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv7-a-neon_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -86439,7 +86439,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -90470,7 +90470,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -99746,17 +99746,17 @@
    [
     {
      "field_name" : "__first_",
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__begin_",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_cap_",
@@ -103472,7 +103472,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -103492,7 +103492,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -113095,7 +113095,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -117899,7 +117899,7 @@
    "source_file" : "external/libcxx/include/memory",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -124913,7 +124913,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -128599,7 +128599,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -130364,7 +130364,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138544,7 +138544,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138778,7 +138778,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139428,7 +139428,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140775,7 +140775,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -144822,7 +144822,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -145462,7 +145462,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146098,7 +146098,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146332,7 +146332,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146982,7 +146982,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147859,7 +147859,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -150595,7 +150595,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -165132,7 +165132,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -194736,7 +194736,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
diff --git a/33/64/arm/source-based/libaudioutils.so.lsdump b/33/64/arm/source-based/libaudioutils.so.lsdump
index 7a45b03..64b5d93 100644
--- a/33/64/arm/source-based/libaudioutils.so.lsdump
+++ b/33/64/arm/source-based/libaudioutils.so.lsdump
@@ -120,6 +120,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIA2_15audio_devices_t",
+   "name" : "audio_devices_t[2]",
+   "referenced_type" : "_ZTI15audio_devices_t",
+   "self_type" : "_ZTIA2_15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIA2_A256_f",
    "name" : "float[2][256]",
    "referenced_type" : "_ZTIA256_f",
@@ -3425,7 +3434,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:335:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:357:1)",
    "referenced_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "self_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "size" : 4,
@@ -3462,7 +3471,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:577:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:599:1)",
    "referenced_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "self_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "size" : 4,
@@ -8804,6 +8813,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIA2_K15audio_devices_t",
+   "name" : "const audio_devices_t[2]",
+   "referenced_type" : "_ZTIA2_15audio_devices_t",
+   "self_type" : "_ZTIA2_K15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIA34_K15audio_devices_t",
    "name" : "const audio_devices_t[34]",
    "referenced_type" : "_ZTIA34_15audio_devices_t",
@@ -8955,7 +8974,7 @@
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIK4$_12",
-   "name" : "const (lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "const (lambda at system/media/audio/include/system/audio.h:1313:41)",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTIK4$_12",
    "size" : 1,
@@ -11026,7 +11045,7 @@
    "alignment" : 1,
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI4$_12",
-   "name" : "(lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "(lambda at system/media/audio/include/system/audio.h:1313:41)",
    "record_kind" : "class",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTI4$_12",
@@ -11088,7 +11107,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN10audio_portUt_E",
-   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:673:5)",
+   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:695:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN10audio_portUt_E",
    "self_type" : "_ZTIN10audio_portUt_E",
@@ -11114,7 +11133,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN13audio_port_v7Ut_E",
-   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:721:5)",
+   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:743:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN13audio_port_v7Ut_E",
    "self_type" : "_ZTIN13audio_port_v7Ut_E",
@@ -11166,7 +11185,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN17audio_port_configUt_E",
-   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:607:5)",
+   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:629:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN17audio_port_configUt_E",
    "self_type" : "_ZTIN17audio_port_configUt_E",
@@ -11188,7 +11207,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN25audio_port_config_mix_extUt_E",
-   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:551:5)",
+   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:573:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN25audio_port_config_mix_extUt_E",
    "self_type" : "_ZTIN25audio_port_config_mix_extUt_E",
diff --git a/33/64/arm/source-based/libbinder.so.lsdump b/33/64/arm/source-based/libbinder.so.lsdump
index d4cfb27..a298eee 100644
--- a/33/64/arm/source-based/libbinder.so.lsdump
+++ b/33/64/arm/source-based/libbinder.so.lsdump
@@ -1688,6 +1688,9 @@
    "name" : "_ZN7android18ServiceManagerShim17getConnectionInfoERKNS_8String16E"
   },
   {
+   "name" : "_ZN7android18ServiceManagerShim19getServiceDebugInfoEv"
+  },
+  {
    "name" : "_ZN7android18ServiceManagerShim20getDeclaredInstancesERKNS_8String16E"
   },
   {
@@ -1959,6 +1962,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
   },
   {
@@ -1991,6 +1998,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
   },
   {
@@ -2115,10 +2126,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
   },
   {
@@ -2131,6 +2138,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
   },
   {
@@ -3442,19 +3453,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3462,7 +3473,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_"
+   "name" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3473,6 +3488,10 @@
    "name" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_"
+  },
+  {
    "name" : "_ZNK7android10MemoryBase9getMemoryEPiPj"
   },
   {
@@ -3739,6 +3758,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
   },
   {
@@ -4590,6 +4613,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEEC2EjjS8_"
   },
   {
@@ -4678,6 +4717,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEEC2EjjS3_"
   },
   {
@@ -4698,6 +4745,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__thread_proxyINS_5tupleIJNS_10unique_ptrINS_15__thread_structENS_14default_deleteIS3_EEEEPFvON7android2spINS7_9RpcServerEEEESA_EEEEEPvSF_"
   },
   {
@@ -4806,10 +4861,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
   },
   {
@@ -5494,6 +5545,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
   },
   {
@@ -5570,10 +5625,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -5610,6 +5661,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
   },
   {
@@ -5738,6 +5797,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
   },
   {
@@ -5746,6 +5809,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE12__move_rangeEPaS4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EEPa"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
   },
   {
@@ -5810,6 +5885,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE18__construct_at_endIPdEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EEPd"
   },
   {
@@ -5870,18 +5949,22 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE12__move_rangeEPiS4_S4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE18__construct_at_endIPiEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EEPi"
   },
   {
@@ -5902,10 +5985,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE12__move_rangeEPxS4_S4_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EEPx"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
   },
   {
@@ -11305,11 +11396,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "referenced_type" : "_ZTIFRN7android10TextOutputES1_E",
-   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "self_type" : "_ZTIFRN7android10TextOutputES1_E",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
@@ -11825,7 +11916,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKNSt3__18functionIFiRKNS_6vectorIhNS_9allocatorIhEEEEbEEE"
@@ -11842,7 +11933,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -11859,7 +11950,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
@@ -11884,7 +11975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_7IBinderEEE",
@@ -11897,7 +11988,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android8BpBinderE"
@@ -11913,7 +12004,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android20RpcCertificateFormatE"
@@ -11929,7 +12020,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -11948,7 +12039,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -11964,7 +12055,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11984,7 +12075,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12000,7 +12091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__18optionalIjEE",
@@ -12013,7 +12104,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12098,7 +12189,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -12115,7 +12206,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12129,7 +12220,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12152,7 +12243,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12169,7 +12260,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12188,7 +12279,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12201,7 +12292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12215,7 +12306,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12234,7 +12325,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12250,7 +12341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12266,7 +12357,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -12282,7 +12373,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12296,7 +12387,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__16threadE"
@@ -12360,7 +12451,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12380,7 +12471,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
@@ -12397,7 +12488,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12420,7 +12511,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12471,7 +12562,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12484,7 +12575,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -12497,7 +12588,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
@@ -12526,7 +12617,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12543,7 +12634,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12559,7 +12650,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12572,7 +12663,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12585,7 +12676,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15204,6 +15295,22 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
    "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
    "parameters" :
@@ -15329,6 +15436,26 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
    "function_name" : "android::sp<android::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
    "parameters" :
@@ -15830,26 +15957,6 @@
   },
   {
    "function_name" : "android::sp<android::IMemory>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" :
-   [
-    "_ZTIN7android10AllocationE"
-   ]
-  },
-  {
-   "function_name" : "android::sp<android::IMemory>::operator=",
    "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
    "parameters" :
    [
@@ -15895,6 +16002,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
    "parameters" :
@@ -21713,78 +21836,78 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA15_Kc"
+     "referenced_type" : "_ZTIRA2_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA15_c"
+    "_ZTIA2_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA24_Kc"
+     "referenced_type" : "_ZTIRA3_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA24_c"
+    "_ZTIA3_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA34_Kc"
+     "referenced_type" : "_ZTIRA4_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA34_c"
+    "_ZTIA4_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA43_Kc"
+     "referenced_type" : "_ZTIRA5_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA43_c"
+    "_ZTIA5_c"
    ]
   },
   {
@@ -21808,21 +21931,40 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+     "referenced_type" : "_ZTIRA9_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    "_ZTIA9_c"
+   ]
+  },
+  {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+    },
+    {
+     "referenced_type" : "_ZTIRKPc"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIPc"
    ]
   },
   {
@@ -21864,6 +22006,25 @@
    ]
   },
   {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE"
+    },
+    {
+     "referenced_type" : "_ZTIRKy"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::MemoryBase::getMemory",
    "linker_set_key" : "_ZNK7android10MemoryBase9getMemoryEPiPj",
    "parameters" :
@@ -24311,7 +24472,7 @@
      "referenced_type" : "_ZTIPKN7android6ParcelE"
     },
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
      "default_arg" : true,
@@ -26281,19 +26442,19 @@
   {
    "linker_set_key" : "_ZN7android4aerrE",
    "name" : "android::aerr",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4alogE",
    "name" : "android::alog",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4aoutE",
    "name" : "android::aout",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
@@ -26784,7 +26945,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -26955,7 +27116,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -29388,8 +29549,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29676,8 +29837,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -34611,8 +34772,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned int>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -34627,8 +34788,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned long long>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv7-a-neon_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -45253,7 +45414,7 @@
     {
      "access" : "private",
      "field_name" : "mTO",
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android10TextOutput6BundleE",
@@ -49351,6 +49512,27 @@
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "field_name" : "pid",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "name" : "android::IServiceManager::ServiceDebugInfo",
+   "referenced_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "self_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "size" : 16,
+   "source_file" : "frameworks/native/libs/binder/include/binder/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -49523,6 +49705,10 @@
      "mangled_component_name" : "_ZN7android15IServiceManager26unregisterForNotificationsERKNS_8String16ERKNS_2spINS0_25LocalRegistrationCallbackEEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android15IServiceManager19getServiceDebugInfoEv"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
diff --git a/33/64/arm/source-based/libcodec2.so.lsdump b/33/64/arm/source-based/libcodec2.so.lsdump
index 0b43491..2306c61 100644
--- a/33/64/arm/source-based/libcodec2.so.lsdump
+++ b/33/64/arm/source-based/libcodec2.so.lsdump
@@ -2384,6 +2384,10 @@
     {
      "enum_field_value" : 16412,
      "name" : "(anonymous namespace)::kParamIndexAndroidChannelMask"
+    },
+    {
+     "enum_field_value" : 16413,
+     "name" : "(anonymous namespace)::kParamIndexTunnelPeekMode"
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_116C2ParamIndexKindE",
@@ -2448,7 +2452,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
-   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:408:1)",
+   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:412:1)",
    "referenced_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "self_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "size" : 4,
@@ -2772,7 +2776,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1584:5)",
+   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1588:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2875,7 +2879,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1810:5)",
+   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1814:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2888,6 +2892,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "C2PlatformConfig::UNSPECIFIED_PEEK"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "C2PlatformConfig::SPECIFIED_PEEK"
+    }
+   ],
+   "linker_set_key" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "name" : "C2PlatformConfig::tunnel_peek_mode_t",
+   "referenced_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "self_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/codec2/core/include/C2Config.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "C2PlatformConfig::NONE"
     },
     {
@@ -2913,7 +2938,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2930,7 +2955,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3041,7 +3066,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1967:5)",
+   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1971:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3058,7 +3083,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1087:5)",
+   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1091:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3075,7 +3100,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1068:5)",
+   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3109,7 +3134,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1434:5)",
+   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1438:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3126,7 +3151,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1557:5)",
+   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1561:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3143,7 +3168,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1941:5)",
+   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1945:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3160,7 +3185,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:753:5)",
+   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:757:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3177,7 +3202,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2321:5)",
+   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2325:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3194,7 +3219,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3211,7 +3236,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3274,7 +3299,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2201:5)",
+   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2205:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3320,7 +3345,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3337,7 +3362,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3354,7 +3379,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3371,7 +3396,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3388,7 +3413,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3405,7 +3430,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3422,7 +3447,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3439,7 +3464,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3477,7 +3502,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1834:5)",
+   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1838:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3494,7 +3519,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2370:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2374:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3536,7 +3561,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1598:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1602:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3553,7 +3578,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2249:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2253:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/33/64/arm/source-based/libcrypto.so.lsdump b/33/64/arm/source-based/libcrypto.so.lsdump
index 748e6e7..d38f947 100644
--- a/33/64/arm/source-based/libcrypto.so.lsdump
+++ b/33/64/arm/source-based/libcrypto.so.lsdump
@@ -3668,12 +3668,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5099,12 +5108,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5180,9 +5183,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5216,15 +5216,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6392,9 +6386,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8221,63 +8212,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9546,30 +9480,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -11147,7 +11057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -11177,7 +11087,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -14490,111 +14400,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18314,7 +18119,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18581,7 +18386,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18629,7 +18434,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18917,7 +18722,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19287,18 +19092,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25533,39 +25326,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25968,18 +25728,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26130,18 +25878,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26157,21 +25893,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31788,24 +31509,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37331,15 +37034,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37979,15 +37673,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38452,7 +38137,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38609,33 +38294,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39212,15 +38870,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39277,7 +38926,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
@@ -39286,26 +38935,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
@@ -39313,8 +38944,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
@@ -39322,8 +38953,35 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
@@ -39698,15 +39356,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40787,7 +40436,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40813,16 +40462,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41279,16 +40918,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41842,47 +41471,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/arm/source-based/libdmabufheap.so.lsdump b/33/64/arm/source-based/libdmabufheap.so.lsdump
index b1ba37a..c7d967e 100644
--- a/33/64/arm/source-based/libdmabufheap.so.lsdump
+++ b/33/64/arm/source-based/libdmabufheap.so.lsdump
@@ -7708,8 +7708,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -7812,8 +7812,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8011,8 +8011,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv7-a-neon_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/33/64/arm/source-based/libgralloctypes.so.lsdump b/33/64/arm/source-based/libgralloctypes.so.lsdump
index 3749213..d9051a8 100644
--- a/33/64/arm/source-based/libgralloctypes.so.lsdump
+++ b/33/64/arm/source-based/libgralloctypes.so.lsdump
@@ -325,6 +325,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS9_8hidl_vecIhEEPFiSJ_PNS0_13OutputHidlVecEE"
   },
   {
@@ -336,6 +344,10 @@
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIN4aidl7android8hardware8graphics6common4RectENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNSD_8hidl_vecIhEEPFiSN_PNS0_13OutputHidlVecEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS7_8hidl_vecIhEEPFiSH_PNS0_13OutputHidlVecEE"
+  },
+  {
    "name" : "_ZN7android8gralloc415decodeBlendModeERKNS_8hardware8hidl_vecIhEEPN4aidl7android8hardware8graphics6common9BlendModeE"
   },
   {
@@ -475,18 +487,6 @@
    "name" : "_ZN7android8gralloc422decodeProtectedContentERKNS_8hardware8hidl_vecIhEEPy"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNS2_8optionalIT_EEPNS7_8hidl_vecIhEEPFiRKSG_PNS0_13OutputHidlVecEE"
-  },
-  {
    "name" : "_ZN7android8gralloc422encodeProtectedContentEyPNS_8hardware8hidl_vecIhEE"
   },
   {
diff --git a/33/64/arm/source-based/libhidlbase.so.lsdump b/33/64/arm/source-based/libhidlbase.so.lsdump
index bf01fe0..2e0f68d 100644
--- a/33/64/arm/source-based/libhidlbase.so.lsdump
+++ b/33/64/arm/source-based/libhidlbase.so.lsdump
@@ -423,10 +423,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
   },
   {
@@ -2493,7 +2489,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE8wait_popEv"
+   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE4pushERKS6_"
   },
   {
    "binding" : "weak",
@@ -2596,10 +2592,6 @@
    "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
-  },
-  {
    "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
   },
   {
@@ -3368,10 +3360,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -3400,10 +3388,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__push_lookaheadERKS3_bj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_DUP_COUNTIPKcEET_S7_S7_Ri"
   },
   {
@@ -3424,6 +3408,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_nondupl_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__push_alternationEPNS_16__owns_one_stateIcEES6_"
   },
   {
@@ -3444,10 +3432,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE20__push_word_boundaryEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__parse_basic_reg_expIPKcEET_S7_S7_"
   },
   {
@@ -3460,11 +3444,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_RE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE23__parse_ERE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
   },
   {
    "binding" : "weak",
@@ -3552,6 +3536,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3572,6 +3560,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3660,6 +3656,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEEC2EjjSA_"
   },
   {
@@ -3668,6 +3668,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EjjS8_"
   },
   {
@@ -3700,6 +3708,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8functionIFvvEEERNS_9allocatorIS3_EEEC2EjjS6_"
   },
   {
@@ -3988,10 +4004,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -4016,10 +4028,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEERKT_"
   },
   {
@@ -4064,6 +4072,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware6Parcel10BufferInfoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
@@ -4112,6 +4124,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE6assignIPS4_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS4_NS_15iterator_traitsISB_E9referenceEEE5valueEvE4typeESB_SB_"
   },
   {
@@ -4120,11 +4136,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE8__appendEj"
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
+   "name" : "_ZNSt3__16vectorINS_7__stateIcEENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
   },
   {
    "binding" : "weak",
@@ -4184,10 +4204,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEjRKS4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
@@ -4232,7 +4248,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFvRKN7android8hardware8hidl_vecINS2_11hidl_stringEEEEEC2ERKS9_"
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
   },
   {
    "binding" : "weak",
@@ -9978,19 +9994,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::ProcessState>::~sp",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware12ProcessStateEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
    "parameters" :
@@ -20986,23 +20989,6 @@
    ]
   },
   {
-   "function_name" : "android::hardware::details::StatusOf",
-   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIvEE"
-    }
-   ],
-   "return_type" : "_ZTIN7android8hardware6ReturnIbEE",
-   "source_file" : "system/libhidl/base/include/hidl/Status.h",
-   "template_args" :
-   [
-    "_ZTIv",
-    "_ZTIb"
-   ]
-  },
-  {
    "access" : "protected",
    "function_name" : "android::hardware::BHwBinder::onTransact",
    "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
@@ -24432,8 +24418,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -25783,7 +25769,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm_armv7-a-neon_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/33/64/arm/source-based/libldacBT_abr.so.lsdump b/33/64/arm/source-based/libldacBT_abr.so.lsdump
index c83d20d..1f1d90a 100644
--- a/33/64/arm/source-based/libldacBT_abr.so.lsdump
+++ b/33/64/arm/source-based/libldacBT_abr.so.lsdump
@@ -3,6 +3,16 @@
  "builtin_types" :
  [
   {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
@@ -31,6 +41,42 @@
  "elf_functions" :
  [
   {
+   "name" : "ldacBT_alter_eqmid_priority"
+  },
+  {
+   "name" : "ldacBT_close_handle"
+  },
+  {
+   "name" : "ldacBT_encode"
+  },
+  {
+   "name" : "ldacBT_free_handle"
+  },
+  {
+   "name" : "ldacBT_get_bitrate"
+  },
+  {
+   "name" : "ldacBT_get_eqmid"
+  },
+  {
+   "name" : "ldacBT_get_error_code"
+  },
+  {
+   "name" : "ldacBT_get_handle"
+  },
+  {
+   "name" : "ldacBT_get_sampling_freq"
+  },
+  {
+   "name" : "ldacBT_get_version"
+  },
+  {
+   "name" : "ldacBT_init_handle_encode"
+  },
+  {
+   "name" : "ldacBT_set_eqmid"
+  },
+  {
    "name" : "ldac_ABR_Init"
   },
   {
@@ -44,6 +90,90 @@
   },
   {
    "name" : "ldac_ABR_set_thresholds"
+  },
+  {
+   "name" : "ldaclib_check_nlnn_shift"
+  },
+  {
+   "name" : "ldaclib_clear_error_code"
+  },
+  {
+   "name" : "ldaclib_clear_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_encode"
+  },
+  {
+   "name" : "ldaclib_flush_encode"
+  },
+  {
+   "name" : "ldaclib_free_encode"
+  },
+  {
+   "name" : "ldaclib_free_handle"
+  },
+  {
+   "name" : "ldaclib_get_branch_version"
+  },
+  {
+   "name" : "ldaclib_get_channel"
+  },
+  {
+   "name" : "ldaclib_get_channel_config_index"
+  },
+  {
+   "name" : "ldaclib_get_config_info"
+  },
+  {
+   "name" : "ldaclib_get_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_get_encode_setting"
+  },
+  {
+   "name" : "ldaclib_get_error_code"
+  },
+  {
+   "name" : "ldaclib_get_frame_samples"
+  },
+  {
+   "name" : "ldaclib_get_handle"
+  },
+  {
+   "name" : "ldaclib_get_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_get_major_version"
+  },
+  {
+   "name" : "ldaclib_get_minor_version"
+  },
+  {
+   "name" : "ldaclib_get_nlnn"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate_index"
+  },
+  {
+   "name" : "ldaclib_get_version"
+  },
+  {
+   "name" : "ldaclib_init_encode"
+  },
+  {
+   "name" : "ldaclib_set_config_info"
+  },
+  {
+   "name" : "ldaclib_set_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_set_encode_info"
+  },
+  {
+   "name" : "ldaclib_set_frame_header"
   }
  ],
  "elf_objects" : [],
diff --git a/33/64/arm/source-based/libmedia_omx.so.lsdump b/33/64/arm/source-based/libmedia_omx.so.lsdump
index 2c0e277..00813f0 100644
--- a/33/64/arm/source-based/libmedia_omx.so.lsdump
+++ b/33/64/arm/source-based/libmedia_omx.so.lsdump
@@ -34177,7 +34177,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -34232,13 +34232,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/arm/source-based/libnl.so.lsdump b/33/64/arm/source-based/libnl.so.lsdump
index b51a34e..ccdca38 100644
--- a/33/64/arm/source-based/libnl.so.lsdump
+++ b/33/64/arm/source-based/libnl.so.lsdump
@@ -4194,7 +4194,7 @@
      "referenced_type" : "_ZTIP7nl_sock"
     },
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4218,7 +4218,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4230,7 +4230,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4278,7 +4278,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv7-a-neon_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
diff --git a/33/64/arm/source-based/libprocessgroup.so.lsdump b/33/64/arm/source-based/libprocessgroup.so.lsdump
index dc09a99..1e02fc2 100644
--- a/33/64/arm/source-based/libprocessgroup.so.lsdump
+++ b/33/64/arm/source-based/libprocessgroup.so.lsdump
@@ -134,6 +134,12 @@
    "name" : "_Z25setProcessGroupSwappinessjii"
   },
   {
+   "name" : "_Z27removeAllEmptyProcessGroupsv"
+  },
+  {
+   "name" : "_Z30removeAllProcessGroupsInternalb"
+  },
+  {
    "name" : "_Z31DropTaskProfilesResourceCachingv"
   },
   {
diff --git a/33/64/arm/source-based/libssl.so.lsdump b/33/64/arm/source-based/libssl.so.lsdump
index bfd411e..ff6f8eb 100644
--- a/33/64/arm/source-based/libssl.so.lsdump
+++ b/33/64/arm/source-based/libssl.so.lsdump
@@ -893,6 +893,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8103,6 +8106,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14810,15 +14828,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19322,7 +19331,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24691,20 +24700,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/arm/source-based/libstagefright_foundation.so.lsdump b/33/64/arm/source-based/libstagefright_foundation.so.lsdump
index bcc56f4..aeb9db8 100644
--- a/33/64/arm/source-based/libstagefright_foundation.so.lsdump
+++ b/33/64/arm/source-based/libstagefright_foundation.so.lsdump
@@ -10603,7 +10603,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -23817,7 +23817,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -23859,13 +23859,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/33/64/arm/source-based/libstagefright_omx.so.lsdump b/33/64/arm/source-based/libstagefright_omx.so.lsdump
index ab8f63d..aed1171 100644
--- a/33/64/arm/source-based/libstagefright_omx.so.lsdump
+++ b/33/64/arm/source-based/libstagefright_omx.so.lsdump
@@ -20950,7 +20950,7 @@
    "referenced_type" : "_ZTIKN7android7String8E",
    "self_type" : "_ZTIPKN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -22183,7 +22183,7 @@
    "referenced_type" : "_ZTIN7android7String8E",
    "self_type" : "_ZTIPN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -38467,7 +38467,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -38522,13 +38522,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm_armv7-a-neon_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm_armv7-a-neon_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/arm/source-based/libui.so.lsdump b/33/64/arm/source-based/libui.so.lsdump
index c17ff72..410bb8c 100644
--- a/33/64/arm/source-based/libui.so.lsdump
+++ b/33/64/arm/source-based/libui.so.lsdump
@@ -1231,10 +1231,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -2406,10 +2402,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeISC_PvEEEE"
   },
   {
@@ -2426,10 +2418,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -2490,6 +2478,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEE9push_backEOS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -2538,10 +2530,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
@@ -2686,18 +2674,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFffEEC2INS_6__bindIRFffRKN7android10ColorSpace18TransferParametersEEJRKNS_12placeholders4__phILi1EEES9_EEEvEET_"
   },
   {
@@ -16533,12 +16509,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
diff --git a/33/64/arm/source-based/libunwindstack.so.lsdump b/33/64/arm/source-based/libunwindstack.so.lsdump
index c8d19d2..d249fcf 100644
--- a/33/64/arm/source-based/libunwindstack.so.lsdump
+++ b/33/64/arm/source-based/libunwindstack.so.lsdump
@@ -3343,7 +3343,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
-   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:45:1)",
+   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:44:1)",
    "referenced_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "self_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "size" : 1,
diff --git a/33/64/arm/source-based/libutils.so.lsdump b/33/64/arm/source-based/libutils.so.lsdump
index fa75432..9bfe756 100644
--- a/33/64/arm/source-based/libutils.so.lsdump
+++ b/33/64/arm/source-based/libutils.so.lsdump
@@ -1226,6 +1226,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
diff --git a/33/64/arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump b/33/64/arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
index 3f3a1f0..ae16edf 100644
--- a/33/64/arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
+++ b/33/64/arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
@@ -7113,7 +7113,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7129,7 +7129,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7918,7 +7918,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device22BpCameraOfflineSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8553,7 +8553,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8569,7 +8569,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8832,7 +8832,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device28ICameraOfflineSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -9041,7 +9041,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm64_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPK7AParcel"
diff --git a/33/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/33/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 4258e2a..3f5ac2b 100644
--- a/33/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/33/64/arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -97,7 +97,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 8,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -358,7 +358,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -367,7 +367,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -437,7 +437,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -751,7 +751,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -833,11 +833,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -854,11 +854,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3129,7 +3129,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3147,7 +3147,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3168,7 +3168,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3252,7 +3252,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3303,7 +3303,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -5042,7 +5042,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -5078,7 +5078,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -5096,7 +5096,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -5114,7 +5114,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5132,7 +5132,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -5186,7 +5186,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5195,7 +5195,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5204,7 +5204,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5249,7 +5249,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5276,7 +5276,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5303,7 +5303,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -6428,7 +6428,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -7977,7 +7977,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -8017,7 +8017,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9709,7 +9709,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -9749,7 +9749,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -9947,7 +9947,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9997,7 +9997,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10007,7 +10007,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10017,7 +10017,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10027,7 +10027,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10278,7 +10278,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -10308,7 +10308,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10571,7 +10571,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10587,7 +10587,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10635,7 +10635,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10677,7 +10677,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10708,7 +10708,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -10745,7 +10745,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10792,7 +10792,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -10818,7 +10818,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -10865,7 +10865,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -11019,7 +11019,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -11040,7 +11040,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -11076,7 +11076,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11228,7 +11228,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -11390,7 +11390,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 8,
@@ -11406,7 +11406,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -11427,7 +11427,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -11484,7 +11484,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11505,7 +11505,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11592,7 +11592,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -11674,7 +11674,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -11829,7 +11829,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -11845,7 +11845,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -11866,7 +11866,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -11948,7 +11948,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -11969,7 +11969,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -11999,7 +11999,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -12309,12 +12309,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -15088,12 +15088,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -15110,12 +15110,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
diff --git a/33/64/arm64/source-based/config.ini b/33/64/arm64/source-based/config.ini
deleted file mode 100644
index a3a2a44..0000000
--- a/33/64/arm64/source-based/config.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-allow_adding_removing_weak_symbols = true
diff --git a/33/64/arm64/source-based/libRSCpuRef.so.lsdump b/33/64/arm64/source-based/libRSCpuRef.so.lsdump
index f698417..f90b0fb 100644
--- a/33/64/arm64/source-based/libRSCpuRef.so.lsdump
+++ b/33/64/arm64/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -520,7 +520,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -547,7 +547,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -610,7 +610,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -734,7 +734,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -4690,7 +4690,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5411,11 +5411,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5730,11 +5730,11 @@
     }
    ],
    "linker_set_key" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/android/dlext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/android/dlext.h:41:1)",
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6095,11 +6095,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -9204,7 +9204,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9222,7 +9222,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9261,7 +9261,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11574,7 +11574,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11592,7 +11592,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11703,7 +11703,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -13328,7 +13328,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
+   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
    "source_file" : "frameworks/rs/cpu_ref/rsCpuExecutable.h"
   },
   {
@@ -21872,7 +21872,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -22034,7 +22034,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -22043,7 +22043,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -22079,7 +22079,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -22097,7 +22097,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -22112,8 +22112,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP8timespec",
    "name" : "timespec *",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "external/libcxx/include/__threading_support"
   },
@@ -22124,7 +22124,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -22232,7 +22232,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22241,7 +22241,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22259,7 +22259,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23114,7 +23114,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23123,7 +23123,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23177,7 +23177,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23285,7 +23285,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -23408,8 +23408,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23858,8 +23858,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -26300,7 +26300,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30251,7 +30251,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -30395,7 +30395,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -30476,7 +30476,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -30647,7 +30647,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -30815,7 +30815,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34498,7 +34498,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 8,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -34541,7 +34541,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -34811,7 +34811,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -34841,7 +34841,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -35049,7 +35049,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35099,7 +35099,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35109,7 +35109,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35119,7 +35119,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35129,7 +35129,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35777,7 +35777,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35807,7 +35807,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -36336,7 +36336,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36352,7 +36352,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36487,7 +36487,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36647,7 +36647,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36678,7 +36678,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36745,7 +36745,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -36761,7 +36761,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36966,7 +36966,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -36992,7 +36992,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -37039,7 +37039,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -37505,7 +37505,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37601,7 +37601,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -37622,7 +37622,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -37658,7 +37658,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -37810,7 +37810,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -37952,7 +37952,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -37973,7 +37973,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -38202,7 +38202,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -38233,7 +38233,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -38269,7 +38269,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -38290,7 +38290,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38449,7 +38449,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -38564,7 +38564,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 8,
@@ -38582,8 +38582,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 16,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -38646,7 +38646,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38662,7 +38662,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -38744,7 +38744,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -38765,7 +38765,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -38795,7 +38795,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -39105,12 +39105,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -45385,7 +45385,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45466,7 +45466,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46241,7 +46241,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46258,7 +46258,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46268,7 +46268,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46285,7 +46285,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49844,12 +49844,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -49866,12 +49866,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
diff --git a/33/64/arm64/source-based/libRSDriver.so.lsdump b/33/64/arm64/source-based/libRSDriver.so.lsdump
index 1edeb20..6dbfa16 100644
--- a/33/64/arm64/source-based/libRSDriver.so.lsdump
+++ b/33/64/arm64/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -259,7 +259,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -502,7 +502,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -554,7 +554,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4404,7 +4404,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5137,11 +5137,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5910,11 +5910,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8015,7 +8015,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8033,7 +8033,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8072,7 +8072,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9815,7 +9815,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9866,7 +9866,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10213,7 +10213,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10237,7 +10237,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -10924,7 +10924,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20792,7 +20792,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -20809,7 +20809,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -20832,7 +20832,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -20861,7 +20861,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -20875,7 +20875,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -20898,7 +20898,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -20918,7 +20918,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20932,7 +20932,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20946,7 +20946,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20960,7 +20960,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIPN9RsdShader13StateBasedKeyE",
@@ -20974,7 +20974,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -21003,7 +21003,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21026,7 +21026,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21039,7 +21039,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21056,7 +21056,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21070,7 +21070,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPPKc"
@@ -21092,7 +21092,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21111,7 +21111,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -21145,7 +21145,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -21179,7 +21179,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21192,7 +21192,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21205,7 +21205,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22979,7 +22979,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23015,7 +23015,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -23060,7 +23060,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23069,7 +23069,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -23447,7 +23447,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23456,7 +23456,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23474,7 +23474,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24113,7 +24113,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24140,7 +24140,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -24830,8 +24830,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -27587,7 +27587,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -27722,7 +27722,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -27821,7 +27821,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -28003,7 +28003,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -30151,7 +30151,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30351,7 +30351,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30361,7 +30361,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30569,7 +30569,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30579,7 +30579,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30589,7 +30589,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30599,7 +30599,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -30717,7 +30717,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -31092,7 +31092,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -31122,7 +31122,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -31793,7 +31793,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -31809,7 +31809,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32011,7 +32011,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32074,7 +32074,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32136,7 +32136,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -32258,7 +32258,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32454,7 +32454,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -32480,7 +32480,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -32615,7 +32615,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -33022,7 +33022,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -33074,7 +33074,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -33110,7 +33110,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -33329,7 +33329,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -33350,7 +33350,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -33519,7 +33519,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -33540,7 +33540,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -33812,7 +33812,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -33927,7 +33927,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 8,
@@ -33945,8 +33945,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
    "size" : 16,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -34009,7 +34009,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -34193,7 +34193,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -34214,7 +34214,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -34296,7 +34296,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -34317,7 +34317,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -34378,7 +34378,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -34688,12 +34688,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "access" : "protected",
@@ -41889,12 +41889,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -41934,12 +41934,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
diff --git a/33/64/arm64/source-based/libRS_internal.so.lsdump b/33/64/arm64/source-based/libRS_internal.so.lsdump
index 853dfb0..cef0d75 100644
--- a/33/64/arm64/source-based/libRS_internal.so.lsdump
+++ b/33/64/arm64/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -70,7 +70,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -349,7 +349,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA31_m",
    "size" : 248,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -493,7 +493,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -520,7 +520,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -583,7 +583,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -680,7 +680,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_f",
@@ -6149,7 +6149,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7149,11 +7149,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8386,11 +8386,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8563,11 +8563,11 @@
     }
    ],
    "linker_set_key" : "_ZTI8$SHUT_RD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h:59:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h:59:1)",
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11525,7 +11525,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11543,7 +11543,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11582,7 +11582,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13649,7 +13649,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13706,7 +13706,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13775,7 +13775,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -15720,7 +15720,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -16789,7 +16789,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -17060,7 +17060,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -17076,7 +17076,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17093,7 +17093,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17110,7 +17110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIP13ANativeWindow",
@@ -17138,7 +17138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript10AllocationE"
@@ -17154,7 +17154,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -17167,7 +17167,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17189,7 +17189,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17211,7 +17211,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17224,7 +17224,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17237,7 +17237,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19745,7 +19745,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21557,7 +21557,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21581,7 +21581,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -22495,7 +22495,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22507,7 +22507,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7IStreamE"
@@ -22539,7 +22539,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22555,7 +22555,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22571,7 +22571,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -22593,7 +22593,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22609,7 +22609,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -23650,7 +23650,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -23744,7 +23744,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -27818,7 +27818,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -27837,7 +27837,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -27862,7 +27862,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -27878,7 +27878,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7OStreamE"
@@ -31725,7 +31725,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35436,7 +35436,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35820,7 +35820,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -36090,7 +36090,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -36135,7 +36135,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -36162,7 +36162,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -36180,7 +36180,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -36198,7 +36198,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -36324,7 +36324,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36333,7 +36333,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36351,7 +36351,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37134,7 +37134,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -37161,7 +37161,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37197,7 +37197,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -37350,7 +37350,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37590,8 +37590,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37833,8 +37833,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37842,8 +37842,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37851,8 +37851,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37860,8 +37860,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40770,7 +40770,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -40842,7 +40842,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -45036,7 +45036,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -45180,7 +45180,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -45279,7 +45279,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -45400,7 +45400,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45550,7 +45550,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49588,7 +49588,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -49665,7 +49665,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *const",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/memory"
@@ -49948,7 +49948,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -49958,7 +49958,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -50038,7 +50038,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50156,7 +50156,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50206,7 +50206,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50216,7 +50216,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50226,7 +50226,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50236,7 +50236,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50952,7 +50952,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "generic",
@@ -51049,7 +51049,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -51079,7 +51079,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -51847,7 +51847,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "encoding",
@@ -52226,7 +52226,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52242,7 +52242,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52470,7 +52470,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52509,7 +52509,7 @@
     {
      "field_name" : "face",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "next",
@@ -52824,7 +52824,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52839,7 +52839,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -52870,7 +52870,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -53081,7 +53081,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53396,7 +53396,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -53422,7 +53422,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -53543,7 +53543,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -54166,7 +54166,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -54283,7 +54283,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54335,7 +54335,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -54371,7 +54371,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -54523,7 +54523,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -54675,7 +54675,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -54691,7 +54691,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -54712,7 +54712,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54733,7 +54733,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -54779,7 +54779,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55034,7 +55034,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -55065,7 +55065,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -55091,7 +55091,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55127,7 +55127,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55148,7 +55148,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55184,7 +55184,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55426,7 +55426,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -55541,7 +55541,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55562,7 +55562,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -55623,7 +55623,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -55711,7 +55711,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -55732,7 +55732,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -55814,7 +55814,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -55835,7 +55835,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -55865,7 +55865,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -56175,12 +56175,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -56447,12 +56447,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h:74:3)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h:74:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -56470,11 +56470,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_Ut_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h:75:5)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h:75:5)",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -68837,12 +68837,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h:117:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -68859,12 +68859,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -86817,7 +86817,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -90951,7 +90951,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -100431,17 +100431,17 @@
    [
     {
      "field_name" : "__first_",
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__begin_",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_cap_",
@@ -104244,7 +104244,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -104264,7 +104264,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -114072,7 +114072,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -118998,7 +118998,7 @@
    "source_file" : "external/libcxx/include/memory",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -126149,7 +126149,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -129873,7 +129873,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -131695,7 +131695,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140086,7 +140086,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140333,7 +140333,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140996,7 +140996,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -142356,7 +142356,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146428,7 +146428,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147144,7 +147144,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147799,7 +147799,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -148046,7 +148046,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -148709,7 +148709,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -149599,7 +149599,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -152374,7 +152374,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -167353,7 +167353,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -197514,7 +197514,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
diff --git a/33/64/arm64/source-based/libaudioutils.so.lsdump b/33/64/arm64/source-based/libaudioutils.so.lsdump
index 7ad8d3a..31a88b0 100644
--- a/33/64/arm64/source-based/libaudioutils.so.lsdump
+++ b/33/64/arm64/source-based/libaudioutils.so.lsdump
@@ -120,6 +120,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIA2_15audio_devices_t",
+   "name" : "audio_devices_t[2]",
+   "referenced_type" : "_ZTI15audio_devices_t",
+   "self_type" : "_ZTIA2_15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIA2_A256_f",
    "name" : "float[2][256]",
    "referenced_type" : "_ZTIA256_f",
@@ -3441,7 +3450,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:335:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:357:1)",
    "referenced_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "self_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "size" : 4,
@@ -3478,7 +3487,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:577:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:599:1)",
    "referenced_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "self_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "size" : 4,
@@ -8838,6 +8847,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIA2_K15audio_devices_t",
+   "name" : "const audio_devices_t[2]",
+   "referenced_type" : "_ZTIA2_15audio_devices_t",
+   "self_type" : "_ZTIA2_K15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIA34_K15audio_devices_t",
    "name" : "const audio_devices_t[34]",
    "referenced_type" : "_ZTIA34_15audio_devices_t",
@@ -8989,7 +9008,7 @@
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIK4$_12",
-   "name" : "const (lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "const (lambda at system/media/audio/include/system/audio.h:1313:41)",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTIK4$_12",
    "size" : 1,
@@ -11070,7 +11089,7 @@
    "alignment" : 1,
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI4$_12",
-   "name" : "(lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "(lambda at system/media/audio/include/system/audio.h:1313:41)",
    "record_kind" : "class",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTI4$_12",
@@ -11132,7 +11151,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN10audio_portUt_E",
-   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:673:5)",
+   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:695:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN10audio_portUt_E",
    "self_type" : "_ZTIN10audio_portUt_E",
@@ -11158,7 +11177,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN13audio_port_v7Ut_E",
-   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:721:5)",
+   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:743:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN13audio_port_v7Ut_E",
    "self_type" : "_ZTIN13audio_port_v7Ut_E",
@@ -11210,7 +11229,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN17audio_port_configUt_E",
-   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:607:5)",
+   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:629:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN17audio_port_configUt_E",
    "self_type" : "_ZTIN17audio_port_configUt_E",
@@ -11232,7 +11251,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN25audio_port_config_mix_extUt_E",
-   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:551:5)",
+   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:573:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN25audio_port_config_mix_extUt_E",
    "self_type" : "_ZTIN25audio_port_config_mix_extUt_E",
diff --git a/33/64/arm64/source-based/libbinder.so.lsdump b/33/64/arm64/source-based/libbinder.so.lsdump
index c6334d8..846557b 100644
--- a/33/64/arm64/source-based/libbinder.so.lsdump
+++ b/33/64/arm64/source-based/libbinder.so.lsdump
@@ -1707,6 +1707,9 @@
    "name" : "_ZN7android18ServiceManagerShim17getConnectionInfoERKNS_8String16E"
   },
   {
+   "name" : "_ZN7android18ServiceManagerShim19getServiceDebugInfoEv"
+  },
+  {
    "name" : "_ZN7android18ServiceManagerShim20getDeclaredInstancesERKNS_8String16E"
   },
   {
@@ -1978,6 +1981,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
   },
   {
@@ -2010,6 +2017,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
   },
   {
@@ -3457,19 +3468,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3477,7 +3488,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_"
+   "name" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3485,11 +3500,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_"
+   "name" : "_ZN7androidlsImEERNS_10TextOutputES2_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsImEERNS_10TextOutputES2_RKT_"
+   "name" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_"
   },
   {
    "name" : "_ZNK7android10MemoryBase9getMemoryEPlPm"
@@ -3758,6 +3773,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android6Parcel11readAlignedImEEiPT_"
   },
   {
@@ -4605,6 +4624,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EmmS6_"
   },
   {
@@ -4645,6 +4668,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EmmS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEERNS_9allocatorISA_EEED2Ev"
   },
   {
@@ -4669,6 +4700,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIlRNS_9allocatorIlEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferImRNS_9allocatorImEEED2Ev"
   },
   {
@@ -5485,10 +5520,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
   },
   {
@@ -5525,6 +5556,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
   },
   {
@@ -5629,6 +5664,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEm"
   },
   {
@@ -5665,6 +5704,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE12__move_rangeEPaS4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EEPa"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEm"
   },
   {
@@ -5777,18 +5828,22 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE12__move_rangeEPiS4_S4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE18__construct_at_endIPiEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_m"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EEPi"
   },
   {
@@ -5821,6 +5876,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE26__swap_out_circular_bufferERNS_14__split_bufferIlRS2_EEPl"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE6assignIPlEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIlNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
   },
   {
@@ -11258,11 +11317,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "referenced_type" : "_ZTIFRN7android10TextOutputES1_E",
-   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "self_type" : "_ZTIFRN7android10TextOutputES1_E",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
@@ -11778,7 +11837,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKNSt3__18functionIFiRKNS_6vectorIhNS_9allocatorIhEEEEbEEE"
@@ -11795,7 +11854,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -11812,7 +11871,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
@@ -11837,7 +11896,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_7IBinderEEE",
@@ -11850,7 +11909,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android8BpBinderE"
@@ -11866,7 +11925,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android20RpcCertificateFormatE"
@@ -11882,7 +11941,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -11901,7 +11960,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -11917,7 +11976,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11937,7 +11996,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -11953,7 +12012,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__18optionalIjEE",
@@ -11966,7 +12025,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12051,7 +12110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -12068,7 +12127,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12082,7 +12141,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12105,7 +12164,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12122,7 +12181,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12141,7 +12200,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIm",
@@ -12154,7 +12213,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIm",
@@ -12168,7 +12227,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12187,7 +12246,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12203,7 +12262,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12219,7 +12278,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -12235,7 +12294,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12249,7 +12308,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__16threadE"
@@ -12313,7 +12372,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12333,7 +12392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
@@ -12350,7 +12409,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12373,7 +12432,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12424,7 +12483,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12437,7 +12496,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -12450,7 +12509,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
@@ -12479,7 +12538,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12496,7 +12555,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12512,7 +12571,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12525,7 +12584,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12538,7 +12597,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15157,6 +15216,22 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
    "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
    "parameters" :
@@ -15282,6 +15357,26 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
    "function_name" : "android::sp<android::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
    "parameters" :
@@ -21640,78 +21735,78 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA15_Kc"
+     "referenced_type" : "_ZTIRA2_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA15_c"
+    "_ZTIA2_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA24_Kc"
+     "referenced_type" : "_ZTIRA3_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA24_c"
+    "_ZTIA3_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA34_Kc"
+     "referenced_type" : "_ZTIRA4_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA34_c"
+    "_ZTIA4_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA43_Kc"
+     "referenced_type" : "_ZTIRA5_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA43_c"
+    "_ZTIA5_c"
    ]
   },
   {
@@ -21735,21 +21830,40 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+     "referenced_type" : "_ZTIRA9_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    "_ZTIA9_c"
+   ]
+  },
+  {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+    },
+    {
+     "referenced_type" : "_ZTIRKPc"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIPc"
    ]
   },
   {
@@ -21773,25 +21887,6 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
-    },
-    {
-     "referenced_type" : "_ZTIRKj"
-    }
-   ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
-   "template_args" :
-   [
-    "_ZTIj"
-   ]
-  },
-  {
-   "function_name" : "android::operator<<",
    "linker_set_key" : "_ZN7androidlsImEERNS_10TextOutputES2_RKT_",
    "parameters" :
    [
@@ -21810,6 +21905,25 @@
    ]
   },
   {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE"
+    },
+    {
+     "referenced_type" : "_ZTIRKy"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::MemoryBase::getMemory",
    "linker_set_key" : "_ZNK7android10MemoryBase9getMemoryEPlPm",
    "parameters" :
@@ -24257,7 +24371,7 @@
      "referenced_type" : "_ZTIPKN7android6ParcelE"
     },
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
      "default_arg" : true,
@@ -26227,19 +26341,19 @@
   {
    "linker_set_key" : "_ZN7android4aerrE",
    "name" : "android::aerr",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4alogE",
    "name" : "android::alog",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4aoutE",
    "name" : "android::aout",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
@@ -26730,7 +26844,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -26901,7 +27015,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -29361,8 +29475,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29667,8 +29781,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -34656,8 +34770,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned int>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -34672,8 +34786,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryImEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned long>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -45748,7 +45862,7 @@
     {
      "access" : "private",
      "field_name" : "mTO",
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android10TextOutput6BundleE",
@@ -49846,6 +49960,27 @@
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "field_name" : "pid",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "name" : "android::IServiceManager::ServiceDebugInfo",
+   "referenced_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "self_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "size" : 32,
+   "source_file" : "frameworks/native/libs/binder/include/binder/IServiceManager.h"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -50018,6 +50153,10 @@
      "mangled_component_name" : "_ZN7android15IServiceManager26unregisterForNotificationsERKNS_8String16ERKNS_2spINS0_25LocalRegistrationCallbackEEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android15IServiceManager19getServiceDebugInfoEv"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
diff --git a/33/64/arm64/source-based/libcodec2.so.lsdump b/33/64/arm64/source-based/libcodec2.so.lsdump
index f21272a..89cbf18 100644
--- a/33/64/arm64/source-based/libcodec2.so.lsdump
+++ b/33/64/arm64/source-based/libcodec2.so.lsdump
@@ -2384,6 +2384,10 @@
     {
      "enum_field_value" : 16412,
      "name" : "(anonymous namespace)::kParamIndexAndroidChannelMask"
+    },
+    {
+     "enum_field_value" : 16413,
+     "name" : "(anonymous namespace)::kParamIndexTunnelPeekMode"
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_116C2ParamIndexKindE",
@@ -2448,7 +2452,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
-   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:408:1)",
+   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:412:1)",
    "referenced_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "self_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "size" : 4,
@@ -2772,7 +2776,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1584:5)",
+   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1588:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2875,7 +2879,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1810:5)",
+   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1814:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2888,6 +2892,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "C2PlatformConfig::UNSPECIFIED_PEEK"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "C2PlatformConfig::SPECIFIED_PEEK"
+    }
+   ],
+   "linker_set_key" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "name" : "C2PlatformConfig::tunnel_peek_mode_t",
+   "referenced_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "self_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/codec2/core/include/C2Config.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "C2PlatformConfig::NONE"
     },
     {
@@ -2913,7 +2938,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2930,7 +2955,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3041,7 +3066,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1967:5)",
+   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1971:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3058,7 +3083,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1087:5)",
+   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1091:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3075,7 +3100,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1068:5)",
+   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3109,7 +3134,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1434:5)",
+   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1438:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3126,7 +3151,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1557:5)",
+   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1561:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3143,7 +3168,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1941:5)",
+   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1945:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3160,7 +3185,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:753:5)",
+   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:757:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3177,7 +3202,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2321:5)",
+   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2325:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3194,7 +3219,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3211,7 +3236,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3274,7 +3299,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2201:5)",
+   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2205:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3320,7 +3345,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3337,7 +3362,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3354,7 +3379,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3371,7 +3396,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3388,7 +3413,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3405,7 +3430,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3422,7 +3447,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3439,7 +3464,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3477,7 +3502,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1834:5)",
+   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1838:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3494,7 +3519,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2370:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2374:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3536,7 +3561,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1598:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1602:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3553,7 +3578,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2249:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2253:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/33/64/arm64/source-based/libcrypto.so.lsdump b/33/64/arm64/source-based/libcrypto.so.lsdump
index d27d301..777777a 100644
--- a/33/64/arm64/source-based/libcrypto.so.lsdump
+++ b/33/64/arm64/source-based/libcrypto.so.lsdump
@@ -3690,12 +3690,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5121,12 +5130,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5202,9 +5205,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5238,15 +5238,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6414,9 +6408,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8243,63 +8234,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9568,30 +9502,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -11169,7 +11079,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -11199,7 +11109,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -14512,111 +14422,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18324,7 +18129,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18591,7 +18396,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18639,7 +18444,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18927,7 +18732,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19297,18 +19102,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25543,39 +25336,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25978,18 +25738,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26140,18 +25888,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26167,21 +25903,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31798,24 +31519,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37341,15 +37044,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37989,15 +37683,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38462,7 +38147,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 8,
@@ -38619,33 +38304,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39222,15 +38880,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39287,7 +38936,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
@@ -39296,26 +38945,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
@@ -39323,8 +38954,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
@@ -39332,8 +38963,35 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
@@ -39708,15 +39366,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40779,7 +40428,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 128,
+   "size" : 112,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40805,16 +40454,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 200,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41271,16 +40910,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 40,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41834,47 +41463,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 32,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/arm64/source-based/libdmabufheap.so.lsdump b/33/64/arm64/source-based/libdmabufheap.so.lsdump
index 0529448..d4d40ee 100644
--- a/33/64/arm64/source-based/libdmabufheap.so.lsdump
+++ b/33/64/arm64/source-based/libdmabufheap.so.lsdump
@@ -7863,8 +7863,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -7967,8 +7967,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8166,8 +8166,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm64_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/33/64/arm64/source-based/libgralloctypes.so.lsdump b/33/64/arm64/source-based/libgralloctypes.so.lsdump
index 1d3894d..801d0f9 100644
--- a/33/64/arm64/source-based/libgralloctypes.so.lsdump
+++ b/33/64/arm64/source-based/libgralloctypes.so.lsdump
@@ -468,14 +468,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8gralloc422encodeOptionalMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNS2_8optionalIT_EEPNS7_8hidl_vecIhEEPFiRKSG_PNS0_13OutputHidlVecEE"
   },
   {
diff --git a/33/64/arm64/source-based/libhidlbase.so.lsdump b/33/64/arm64/source-based/libhidlbase.so.lsdump
index 1d27f3e..2e599f8 100644
--- a/33/64/arm64/source-based/libhidlbase.so.lsdump
+++ b/33/64/arm64/source-based/libhidlbase.so.lsdump
@@ -423,10 +423,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
   },
   {
@@ -2493,7 +2489,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE8wait_popEv"
+   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE4pushERKS6_"
   },
   {
    "binding" : "weak",
@@ -2596,10 +2592,6 @@
    "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
-  },
-  {
    "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
   },
   {
@@ -3368,10 +3360,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -3400,10 +3388,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__push_lookaheadERKS3_bj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_DUP_COUNTIPKcEET_S7_S7_Ri"
   },
   {
@@ -3424,6 +3408,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_nondupl_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__push_alternationEPNS_16__owns_one_stateIcEES6_"
   },
   {
@@ -3444,10 +3432,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE20__push_word_boundaryEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__parse_basic_reg_expIPKcEET_S7_S7_"
   },
   {
@@ -3460,11 +3444,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_RE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE23__parse_ERE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
   },
   {
    "binding" : "weak",
@@ -3552,6 +3536,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3572,6 +3560,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairImPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3672,14 +3668,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EmmS8_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EmmS8_"
   },
   {
@@ -3976,10 +3964,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEEbEERKT_DpOT0_"
   },
   {
@@ -4056,10 +4040,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEm"
   },
   {
@@ -4120,6 +4100,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7__stateIcEENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
@@ -4224,7 +4212,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFvRKN7android8hardware8hidl_vecINS2_11hidl_stringEEEEEC2ERKS9_"
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
   },
   {
    "binding" : "weak",
@@ -9970,19 +9958,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::ProcessState>::~sp",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware12ProcessStateEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
    "parameters" :
@@ -20978,23 +20953,6 @@
    ]
   },
   {
-   "function_name" : "android::hardware::details::StatusOf",
-   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIvEE"
-    }
-   ],
-   "return_type" : "_ZTIN7android8hardware6ReturnIbEE",
-   "source_file" : "system/libhidl/base/include/hidl/Status.h",
-   "template_args" :
-   [
-    "_ZTIv",
-    "_ZTIb"
-   ]
-  },
-  {
    "access" : "protected",
    "function_name" : "android::hardware::BHwBinder::onTransact",
    "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
@@ -24424,8 +24382,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -25775,7 +25733,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/33/64/arm64/source-based/libldacBT_abr.so.lsdump b/33/64/arm64/source-based/libldacBT_abr.so.lsdump
index 7bff7ec..d317f6f 100644
--- a/33/64/arm64/source-based/libldacBT_abr.so.lsdump
+++ b/33/64/arm64/source-based/libldacBT_abr.so.lsdump
@@ -3,6 +3,16 @@
  "builtin_types" :
  [
   {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
@@ -31,6 +41,42 @@
  "elf_functions" :
  [
   {
+   "name" : "ldacBT_alter_eqmid_priority"
+  },
+  {
+   "name" : "ldacBT_close_handle"
+  },
+  {
+   "name" : "ldacBT_encode"
+  },
+  {
+   "name" : "ldacBT_free_handle"
+  },
+  {
+   "name" : "ldacBT_get_bitrate"
+  },
+  {
+   "name" : "ldacBT_get_eqmid"
+  },
+  {
+   "name" : "ldacBT_get_error_code"
+  },
+  {
+   "name" : "ldacBT_get_handle"
+  },
+  {
+   "name" : "ldacBT_get_sampling_freq"
+  },
+  {
+   "name" : "ldacBT_get_version"
+  },
+  {
+   "name" : "ldacBT_init_handle_encode"
+  },
+  {
+   "name" : "ldacBT_set_eqmid"
+  },
+  {
    "name" : "ldac_ABR_Init"
   },
   {
@@ -44,6 +90,90 @@
   },
   {
    "name" : "ldac_ABR_set_thresholds"
+  },
+  {
+   "name" : "ldaclib_check_nlnn_shift"
+  },
+  {
+   "name" : "ldaclib_clear_error_code"
+  },
+  {
+   "name" : "ldaclib_clear_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_encode"
+  },
+  {
+   "name" : "ldaclib_flush_encode"
+  },
+  {
+   "name" : "ldaclib_free_encode"
+  },
+  {
+   "name" : "ldaclib_free_handle"
+  },
+  {
+   "name" : "ldaclib_get_branch_version"
+  },
+  {
+   "name" : "ldaclib_get_channel"
+  },
+  {
+   "name" : "ldaclib_get_channel_config_index"
+  },
+  {
+   "name" : "ldaclib_get_config_info"
+  },
+  {
+   "name" : "ldaclib_get_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_get_encode_setting"
+  },
+  {
+   "name" : "ldaclib_get_error_code"
+  },
+  {
+   "name" : "ldaclib_get_frame_samples"
+  },
+  {
+   "name" : "ldaclib_get_handle"
+  },
+  {
+   "name" : "ldaclib_get_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_get_major_version"
+  },
+  {
+   "name" : "ldaclib_get_minor_version"
+  },
+  {
+   "name" : "ldaclib_get_nlnn"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate_index"
+  },
+  {
+   "name" : "ldaclib_get_version"
+  },
+  {
+   "name" : "ldaclib_init_encode"
+  },
+  {
+   "name" : "ldaclib_set_config_info"
+  },
+  {
+   "name" : "ldaclib_set_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_set_encode_info"
+  },
+  {
+   "name" : "ldaclib_set_frame_header"
   }
  ],
  "elf_objects" : [],
diff --git a/33/64/arm64/source-based/libmedia_omx.so.lsdump b/33/64/arm64/source-based/libmedia_omx.so.lsdump
index f05ab88..f78abe4 100644
--- a/33/64/arm64/source-based/libmedia_omx.so.lsdump
+++ b/33/64/arm64/source-based/libmedia_omx.so.lsdump
@@ -34196,7 +34196,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -34251,13 +34251,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/arm64/source-based/libnl.so.lsdump b/33/64/arm64/source-based/libnl.so.lsdump
index abe9677..1e84ad3 100644
--- a/33/64/arm64/source-based/libnl.so.lsdump
+++ b/33/64/arm64/source-based/libnl.so.lsdump
@@ -4185,7 +4185,7 @@
      "referenced_type" : "_ZTIP7nl_sock"
     },
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4209,7 +4209,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4221,7 +4221,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4269,7 +4269,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm64_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
diff --git a/33/64/arm64/source-based/libprocessgroup.so.lsdump b/33/64/arm64/source-based/libprocessgroup.so.lsdump
index 9d74539..df7a726 100644
--- a/33/64/arm64/source-based/libprocessgroup.so.lsdump
+++ b/33/64/arm64/source-based/libprocessgroup.so.lsdump
@@ -134,6 +134,12 @@
    "name" : "_Z25setProcessGroupSwappinessjii"
   },
   {
+   "name" : "_Z27removeAllEmptyProcessGroupsv"
+  },
+  {
+   "name" : "_Z30removeAllProcessGroupsInternalb"
+  },
+  {
    "name" : "_Z31DropTaskProfilesResourceCachingv"
   },
   {
diff --git a/33/64/arm64/source-based/libssl.so.lsdump b/33/64/arm64/source-based/libssl.so.lsdump
index ad9e653..2e47e28 100644
--- a/33/64/arm64/source-based/libssl.so.lsdump
+++ b/33/64/arm64/source-based/libssl.so.lsdump
@@ -912,6 +912,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8122,6 +8125,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14829,15 +14847,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -24719,20 +24728,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/arm64/source-based/libstagefright_foundation.so.lsdump b/33/64/arm64/source-based/libstagefright_foundation.so.lsdump
index 9438d78..e659265 100644
--- a/33/64/arm64/source-based/libstagefright_foundation.so.lsdump
+++ b/33/64/arm64/source-based/libstagefright_foundation.so.lsdump
@@ -10603,7 +10603,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -23835,7 +23835,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -23877,13 +23877,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/33/64/arm64/source-based/libstagefright_omx.so.lsdump b/33/64/arm64/source-based/libstagefright_omx.so.lsdump
index d400399..39aca53 100644
--- a/33/64/arm64/source-based/libstagefright_omx.so.lsdump
+++ b/33/64/arm64/source-based/libstagefright_omx.so.lsdump
@@ -210,8 +210,8 @@
   {
    "linker_set_key" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE[]",
-   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -13919,7 +13919,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -13940,7 +13940,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjP20OMX_BUFFERHEADERTYPEE",
@@ -13958,7 +13958,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -13985,7 +13985,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14012,7 +14012,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14144,7 +14144,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjjP20OMX_BUFFERHEADERTYPEE",
@@ -20308,8 +20308,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP16OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20362,8 +20362,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20965,8 +20965,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android15OMXNodeInstanceE",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -21463,7 +21463,7 @@
    "referenced_type" : "_ZTIKN7android7String8E",
    "self_type" : "_ZTIPKN7android7String8E",
    "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
@@ -21829,8 +21829,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android15OMXNodeInstanceE",
    "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -22705,7 +22705,7 @@
    "referenced_type" : "_ZTIN7android7String8E",
    "self_type" : "_ZTIPN7android7String8E",
    "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
@@ -22873,8 +22873,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -23053,8 +23053,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -23439,8 +23439,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android15OMXNodeInstanceE",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24472,8 +24472,8 @@
    ],
    "linker_set_key" : "_ZTI12OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24673,8 +24673,8 @@
    ],
    "linker_set_key" : "_ZTI16OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 24,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -24936,8 +24936,8 @@
    ],
    "linker_set_key" : "_ZTI17OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 160,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -25370,8 +25370,8 @@
    ],
    "linker_set_key" : "_ZTI20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 80,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27643,8 +27643,8 @@
    ],
    "linker_set_key" : "_ZTI25OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27829,8 +27829,8 @@
    ],
    "linker_set_key" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 12,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29152,8 +29152,8 @@
    ],
    "linker_set_key" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 180,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29440,8 +29440,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -29628,8 +29628,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -29868,7 +29868,7 @@
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -29883,8 +29883,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 96,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -30082,8 +30082,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h"
   },
@@ -30440,8 +30440,8 @@
    ],
    "linker_set_key" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32063,8 +32063,8 @@
    ],
    "linker_set_key" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h"
   },
@@ -32165,8 +32165,8 @@
    ],
    "linker_set_key" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -32813,15 +32813,15 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "other",
@@ -32832,8 +32832,8 @@
    "linker_set_key" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE::(unnamed union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5)",
    "record_kind" : "union",
-   "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -33421,13 +33421,13 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
     "_ZTIj"
    ]
   },
@@ -33467,13 +33467,13 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase>>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
-    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
     "_ZTIN7android2wpINS_4hidl4base4V1_05IBaseEEE"
    ]
   },
@@ -33559,14 +33559,14 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
     "_ZTIj",
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ]
   },
   {
@@ -34557,13 +34557,13 @@
    "linker_set_key" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/SortedVector.h",
    "template_args" :
    [
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ],
    "vtable_components" :
    [
@@ -35601,7 +35601,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 576,
-     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35691,13 +35691,13 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 2368,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 2688,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35793,13 +35793,13 @@
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 4480,
-     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 4800,
-     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35810,8 +35810,8 @@
    ],
    "linker_set_key" : "_ZTIN7android15OMXNodeInstanceE",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "vtable_components" :
@@ -40387,7 +40387,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -40442,13 +40442,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
@@ -43179,7 +43179,7 @@
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 832,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "protected",
@@ -43190,8 +43190,8 @@
    ],
    "linker_set_key" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 176,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "vtable_components" :
diff --git a/33/64/arm64/source-based/libui.so.lsdump b/33/64/arm64/source-based/libui.so.lsdump
index 5574090..e63c7d2 100644
--- a/33/64/arm64/source-based/libui.so.lsdump
+++ b/33/64/arm64/source-based/libui.so.lsdump
@@ -1231,10 +1231,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -2442,6 +2438,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEEC2EmmS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
   },
   {
@@ -2470,6 +2470,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEE9push_backEOS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -2662,10 +2666,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
@@ -16501,12 +16501,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
diff --git a/33/64/arm64/source-based/libunwindstack.so.lsdump b/33/64/arm64/source-based/libunwindstack.so.lsdump
index 9ebd5c0..b041b92 100644
--- a/33/64/arm64/source-based/libunwindstack.so.lsdump
+++ b/33/64/arm64/source-based/libunwindstack.so.lsdump
@@ -3330,7 +3330,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
-   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:45:1)",
+   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:44:1)",
    "referenced_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "self_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "size" : 1,
diff --git a/33/64/arm64/source-based/libutils.so.lsdump b/33/64/arm64/source-based/libutils.so.lsdump
index 0abd631..2475c48 100644
--- a/33/64/arm64/source-based/libutils.so.lsdump
+++ b/33/64/arm64/source-based/libutils.so.lsdump
@@ -1246,6 +1246,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueImEEmRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE17__deallocate_nodeEPNS_16__hash_node_baseIPNS_11__hash_nodeIS5_PvEEEE"
   },
   {
@@ -1254,10 +1258,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS5_PvEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE6rehashEm"
   },
   {
diff --git a/33/64/arm_arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump b/33/64/arm_arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
index b96fc91..5a96a06 100644
--- a/33/64/arm_arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
+++ b/33/64/arm_arm64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
@@ -7111,7 +7111,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7127,7 +7127,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7916,7 +7916,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device22BpCameraOfflineSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8551,7 +8551,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8567,7 +8567,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8830,7 +8830,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device28ICameraOfflineSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -9039,7 +9039,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_arm_armv8-a_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPK7AParcel"
diff --git a/33/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/33/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 8bbd307..757d339 100644
--- a/33/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/33/64/arm_arm64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -340,7 +340,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 1,
@@ -367,7 +367,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -428,7 +428,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -805,11 +805,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -826,11 +826,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -960,11 +960,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3178,7 +3178,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3196,7 +3196,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3217,7 +3217,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3301,7 +3301,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5028,7 +5028,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -5037,7 +5037,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5073,7 +5073,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -5091,7 +5091,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -5127,7 +5127,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5145,7 +5145,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5190,7 +5190,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5199,7 +5199,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5208,7 +5208,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5253,7 +5253,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5307,7 +5307,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -6405,7 +6405,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -7918,7 +7918,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -7958,7 +7958,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9590,7 +9590,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9630,7 +9630,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9818,7 +9818,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9868,7 +9868,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9878,7 +9878,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9888,7 +9888,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9898,7 +9898,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10182,7 +10182,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10219,7 +10219,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -10249,7 +10249,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10311,7 +10311,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10388,7 +10388,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10460,7 +10460,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10476,7 +10476,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10524,7 +10524,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10566,7 +10566,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10603,7 +10603,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10650,7 +10650,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10697,7 +10697,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -10851,7 +10851,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -10937,7 +10937,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10958,7 +10958,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -10994,7 +10994,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -11146,7 +11146,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -11308,7 +11308,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -11324,7 +11324,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -11345,7 +11345,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11402,7 +11402,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11423,7 +11423,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11510,7 +11510,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -11592,7 +11592,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -11736,7 +11736,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -11757,7 +11757,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11773,7 +11773,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -11794,7 +11794,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -11876,7 +11876,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -11892,7 +11892,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -11922,7 +11922,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -11938,7 +11938,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -12248,12 +12248,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -12299,7 +12299,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -15094,12 +15094,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15117,11 +15117,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15138,12 +15138,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/arm_arm64/source-based/config.ini b/33/64/arm_arm64/source-based/config.ini
deleted file mode 100644
index a3a2a44..0000000
--- a/33/64/arm_arm64/source-based/config.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-allow_adding_removing_weak_symbols = true
diff --git a/33/64/arm_arm64/source-based/libRSCpuRef.so.lsdump b/33/64/arm_arm64/source-based/libRSCpuRef.so.lsdump
index 5d2a7f7..8f5f461 100644
--- a/33/64/arm_arm64/source-based/libRSCpuRef.so.lsdump
+++ b/33/64/arm_arm64/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -214,7 +214,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -394,7 +394,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -520,7 +520,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -700,7 +700,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -743,7 +743,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -4676,7 +4676,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5397,11 +5397,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5716,11 +5716,11 @@
     }
    ],
    "linker_set_key" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/android/dlext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/android/dlext.h:41:1)",
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6081,11 +6081,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6215,11 +6215,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -9246,7 +9246,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9285,7 +9285,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9324,7 +9324,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11637,7 +11637,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11655,7 +11655,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13391,7 +13391,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
+   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
    "source_file" : "frameworks/rs/cpu_ref/rsCpuExecutable.h"
   },
   {
@@ -21881,7 +21881,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -21917,7 +21917,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -22052,7 +22052,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -22061,7 +22061,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -22097,7 +22097,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -22130,8 +22130,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8timespec",
    "name" : "timespec *",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/__threading_support"
   },
@@ -22142,7 +22142,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -22160,7 +22160,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -22250,7 +22250,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22268,7 +22268,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22286,7 +22286,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -23141,7 +23141,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -23150,7 +23150,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -23312,7 +23312,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -23435,8 +23435,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23885,8 +23885,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -26291,7 +26291,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -30215,7 +30215,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -30359,7 +30359,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -30431,7 +30431,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -30612,7 +30612,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -30780,7 +30780,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34403,7 +34403,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -34446,7 +34446,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34716,7 +34716,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34746,7 +34746,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34944,7 +34944,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -34994,7 +34994,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35004,7 +35004,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35014,7 +35014,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35024,7 +35024,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35440,7 +35440,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35742,7 +35742,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -35772,7 +35772,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35834,7 +35834,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36074,7 +36074,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36249,7 +36249,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36265,7 +36265,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36400,7 +36400,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36560,7 +36560,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36627,7 +36627,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -36643,7 +36643,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36848,7 +36848,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36895,7 +36895,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37361,7 +37361,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37452,7 +37452,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -37538,7 +37538,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -37559,7 +37559,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -37595,7 +37595,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -37747,7 +37747,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -37889,7 +37889,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -37910,7 +37910,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38134,7 +38134,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -38165,7 +38165,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -38201,7 +38201,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -38222,7 +38222,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38381,7 +38381,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -38480,7 +38480,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -38498,8 +38498,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -38567,7 +38567,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38588,7 +38588,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -38604,7 +38604,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -38686,7 +38686,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -38702,7 +38702,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -38732,7 +38732,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -38748,7 +38748,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39058,12 +39058,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -39109,7 +39109,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -45353,7 +45353,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45434,7 +45434,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46209,7 +46209,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46226,7 +46226,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46236,7 +46236,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -46253,7 +46253,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49813,12 +49813,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49836,11 +49836,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49857,12 +49857,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/arm_arm64/source-based/libRSDriver.so.lsdump b/33/64/arm_arm64/source-based/libRSDriver.so.lsdump
index c2df70b..0ac159d 100644
--- a/33/64/arm_arm64/source-based/libRSDriver.so.lsdump
+++ b/33/64/arm_arm64/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -295,7 +295,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -322,7 +322,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -511,7 +511,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -538,7 +538,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -563,7 +563,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4562,7 +4562,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5295,11 +5295,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6068,11 +6068,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6244,11 +6244,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8250,7 +8250,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8268,7 +8268,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8307,7 +8307,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10050,7 +10050,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10448,7 +10448,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10472,7 +10472,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11159,7 +11159,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22176,7 +22176,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22193,7 +22193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22216,7 +22216,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22245,7 +22245,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -22259,7 +22259,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22282,7 +22282,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22302,7 +22302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22316,7 +22316,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22330,7 +22330,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22344,7 +22344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIPN9RsdShader13StateBasedKeyE",
@@ -22358,7 +22358,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22387,7 +22387,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22410,7 +22410,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22423,7 +22423,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22440,7 +22440,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22454,7 +22454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPPKc"
@@ -22476,7 +22476,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22495,7 +22495,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22529,7 +22529,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22563,7 +22563,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22576,7 +22576,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22589,7 +22589,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24192,7 +24192,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24345,7 +24345,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -24381,7 +24381,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -24435,7 +24435,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -24462,7 +24462,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24876,7 +24876,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24885,7 +24885,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24903,7 +24903,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25542,7 +25542,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -26313,8 +26313,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -29079,7 +29079,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -29214,7 +29214,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -29313,7 +29313,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -29513,7 +29513,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -31721,7 +31721,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31921,7 +31921,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31931,7 +31931,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32159,7 +32159,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32169,7 +32169,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32179,7 +32179,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32189,7 +32189,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -32307,7 +32307,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -32669,7 +32669,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -32722,7 +32722,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -32752,7 +32752,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -32814,7 +32814,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -33054,7 +33054,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -33356,7 +33356,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33372,7 +33372,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33559,7 +33559,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -33622,7 +33622,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33760,7 +33760,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33926,7 +33926,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -34061,7 +34061,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -34453,7 +34453,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34539,7 +34539,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34591,7 +34591,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -34627,7 +34627,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -34846,7 +34846,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -34867,7 +34867,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35036,7 +35036,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -35057,7 +35057,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35284,7 +35284,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35383,7 +35383,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -35401,8 +35401,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/driver/rsdGL.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -35470,7 +35470,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -35491,7 +35491,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35675,7 +35675,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35696,7 +35696,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -35778,7 +35778,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -35794,7 +35794,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -35840,7 +35840,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35856,7 +35856,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36166,12 +36166,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -36217,7 +36217,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "access" : "protected",
@@ -43425,12 +43425,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43448,11 +43448,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -43492,12 +43492,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/arm_arm64/source-based/libRS_internal.so.lsdump b/33/64/arm_arm64/source-based/libRS_internal.so.lsdump
index 9b5df90..cc9613e 100644
--- a/33/64/arm_arm64/source-based/libRS_internal.so.lsdump
+++ b/33/64/arm_arm64/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA120_c",
    "size" : 120,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA128_m",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA18_m",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -358,7 +358,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIA32_y",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -556,7 +556,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -574,7 +574,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIA8_N11user_fpregs6fp_regE",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA8_h",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -680,7 +680,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_f",
@@ -6130,7 +6130,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7130,11 +7130,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8367,11 +8367,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8543,11 +8543,11 @@
     }
    ],
    "linker_set_key" : "_ZTI7$REG_R0",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:41:1)",
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8621,11 +8621,11 @@
     }
    ],
    "linker_set_key" : "_ZTI8$SHUT_RD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h:59:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h:59:1)",
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11583,7 +11583,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11601,7 +11601,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11640,7 +11640,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13707,7 +13707,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13764,7 +13764,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -15778,7 +15778,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -16847,7 +16847,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -17118,7 +17118,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -17134,7 +17134,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17151,7 +17151,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17168,7 +17168,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIP13ANativeWindow",
@@ -17196,7 +17196,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript10AllocationE"
@@ -17212,7 +17212,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -17225,7 +17225,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17247,7 +17247,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17269,7 +17269,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17282,7 +17282,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17295,7 +17295,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19803,7 +19803,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21615,7 +21615,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21639,7 +21639,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -22553,7 +22553,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22565,7 +22565,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7IStreamE"
@@ -22597,7 +22597,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22613,7 +22613,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22629,7 +22629,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -22651,7 +22651,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22667,7 +22667,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -23708,7 +23708,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -23802,7 +23802,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -27876,7 +27876,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -27895,7 +27895,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -27920,7 +27920,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -27936,7 +27936,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7OStreamE"
@@ -31783,7 +31783,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35449,7 +35449,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35815,7 +35815,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -35860,7 +35860,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36094,7 +36094,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36139,7 +36139,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -36166,7 +36166,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -36202,7 +36202,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36229,7 +36229,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36337,7 +36337,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36346,7 +36346,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36364,7 +36364,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37147,7 +37147,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37174,7 +37174,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37363,7 +37363,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -37603,8 +37603,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37846,8 +37846,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37855,8 +37855,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37864,8 +37864,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37873,8 +37873,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40747,7 +40747,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -40819,7 +40819,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -44995,7 +44995,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -45139,7 +45139,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -45229,7 +45229,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -45350,7 +45350,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45500,7 +45500,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49488,7 +49488,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49565,7 +49565,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *const",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/memory"
@@ -49848,7 +49848,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49858,7 +49858,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49938,7 +49938,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50046,7 +50046,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50096,7 +50096,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50106,7 +50106,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50116,7 +50116,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50126,7 +50126,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50645,7 +50645,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -50933,7 +50933,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "generic",
@@ -51009,7 +51009,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -51039,7 +51039,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51101,7 +51101,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -51341,7 +51341,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -51791,7 +51791,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "encoding",
@@ -52134,7 +52134,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52150,7 +52150,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52378,7 +52378,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52417,7 +52417,7 @@
     {
      "field_name" : "face",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "next",
@@ -52732,7 +52732,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52747,7 +52747,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -52958,7 +52958,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53273,7 +53273,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53394,7 +53394,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -54017,7 +54017,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -54129,7 +54129,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54215,7 +54215,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54267,7 +54267,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54303,7 +54303,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -54455,7 +54455,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -54607,7 +54607,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54623,7 +54623,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -54644,7 +54644,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54665,7 +54665,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54711,7 +54711,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 28,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54961,7 +54961,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54992,7 +54992,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 4,
@@ -55018,7 +55018,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55054,7 +55054,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55075,7 +55075,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55111,7 +55111,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55353,7 +55353,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -55452,7 +55452,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55473,7 +55473,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -55539,7 +55539,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -55560,7 +55560,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -55648,7 +55648,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -55669,7 +55669,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -55751,7 +55751,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -55767,7 +55767,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -55797,7 +55797,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -55813,7 +55813,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56123,12 +56123,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -56174,7 +56174,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56441,12 +56441,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h:74:3)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h:74:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -56464,11 +56464,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_Ut_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h:75:5)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h:75:5)",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -68843,12 +68843,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68866,11 +68866,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:90:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h:91:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68887,12 +68887,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -86439,7 +86439,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -90470,7 +90470,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -99746,17 +99746,17 @@
    [
     {
      "field_name" : "__first_",
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__begin_",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_cap_",
@@ -103472,7 +103472,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -103492,7 +103492,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -113095,7 +113095,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -117899,7 +117899,7 @@
    "source_file" : "external/libcxx/include/memory",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -124913,7 +124913,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -128599,7 +128599,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -130364,7 +130364,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138544,7 +138544,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138778,7 +138778,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139428,7 +139428,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140775,7 +140775,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -144822,7 +144822,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -145462,7 +145462,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146098,7 +146098,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146332,7 +146332,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146982,7 +146982,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147859,7 +147859,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -150595,7 +150595,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -165132,7 +165132,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -194736,7 +194736,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
diff --git a/33/64/arm_arm64/source-based/libaudioutils.so.lsdump b/33/64/arm_arm64/source-based/libaudioutils.so.lsdump
index 7a45b03..64b5d93 100644
--- a/33/64/arm_arm64/source-based/libaudioutils.so.lsdump
+++ b/33/64/arm_arm64/source-based/libaudioutils.so.lsdump
@@ -120,6 +120,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIA2_15audio_devices_t",
+   "name" : "audio_devices_t[2]",
+   "referenced_type" : "_ZTI15audio_devices_t",
+   "self_type" : "_ZTIA2_15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIA2_A256_f",
    "name" : "float[2][256]",
    "referenced_type" : "_ZTIA256_f",
@@ -3425,7 +3434,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:335:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:357:1)",
    "referenced_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "self_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "size" : 4,
@@ -3462,7 +3471,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:577:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:599:1)",
    "referenced_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "self_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "size" : 4,
@@ -8804,6 +8813,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIA2_K15audio_devices_t",
+   "name" : "const audio_devices_t[2]",
+   "referenced_type" : "_ZTIA2_15audio_devices_t",
+   "self_type" : "_ZTIA2_K15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIA34_K15audio_devices_t",
    "name" : "const audio_devices_t[34]",
    "referenced_type" : "_ZTIA34_15audio_devices_t",
@@ -8955,7 +8974,7 @@
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIK4$_12",
-   "name" : "const (lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "const (lambda at system/media/audio/include/system/audio.h:1313:41)",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTIK4$_12",
    "size" : 1,
@@ -11026,7 +11045,7 @@
    "alignment" : 1,
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI4$_12",
-   "name" : "(lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "(lambda at system/media/audio/include/system/audio.h:1313:41)",
    "record_kind" : "class",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTI4$_12",
@@ -11088,7 +11107,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN10audio_portUt_E",
-   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:673:5)",
+   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:695:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN10audio_portUt_E",
    "self_type" : "_ZTIN10audio_portUt_E",
@@ -11114,7 +11133,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN13audio_port_v7Ut_E",
-   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:721:5)",
+   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:743:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN13audio_port_v7Ut_E",
    "self_type" : "_ZTIN13audio_port_v7Ut_E",
@@ -11166,7 +11185,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN17audio_port_configUt_E",
-   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:607:5)",
+   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:629:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN17audio_port_configUt_E",
    "self_type" : "_ZTIN17audio_port_configUt_E",
@@ -11188,7 +11207,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN25audio_port_config_mix_extUt_E",
-   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:551:5)",
+   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:573:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN25audio_port_config_mix_extUt_E",
    "self_type" : "_ZTIN25audio_port_config_mix_extUt_E",
diff --git a/33/64/arm_arm64/source-based/libbinder.so.lsdump b/33/64/arm_arm64/source-based/libbinder.so.lsdump
index 9245817..7e4acb8 100644
--- a/33/64/arm_arm64/source-based/libbinder.so.lsdump
+++ b/33/64/arm_arm64/source-based/libbinder.so.lsdump
@@ -1688,6 +1688,9 @@
    "name" : "_ZN7android18ServiceManagerShim17getConnectionInfoERKNS_8String16E"
   },
   {
+   "name" : "_ZN7android18ServiceManagerShim19getServiceDebugInfoEv"
+  },
+  {
    "name" : "_ZN7android18ServiceManagerShim20getDeclaredInstancesERKNS_8String16E"
   },
   {
@@ -1959,6 +1962,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
   },
   {
@@ -1991,6 +1998,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
   },
   {
@@ -2115,10 +2126,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
   },
   {
@@ -2131,6 +2138,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
   },
   {
@@ -3442,19 +3453,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3462,7 +3473,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_"
+   "name" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3473,6 +3488,10 @@
    "name" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_"
+  },
+  {
    "name" : "_ZNK7android10MemoryBase9getMemoryEPiPj"
   },
   {
@@ -3739,6 +3758,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
   },
   {
@@ -4590,6 +4613,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEEC2EjjS8_"
   },
   {
@@ -4678,6 +4717,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEEC2EjjS3_"
   },
   {
@@ -4698,6 +4745,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEEC2EjjS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__thread_proxyINS_5tupleIJNS_10unique_ptrINS_15__thread_structENS_14default_deleteIS3_EEEEPFvON7android2spINS7_9RpcServerEEEESA_EEEEEPvSF_"
   },
   {
@@ -4806,10 +4861,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
   },
   {
@@ -5494,6 +5545,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
   },
   {
@@ -5570,10 +5625,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -5610,6 +5661,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
   },
   {
@@ -5738,6 +5797,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
   },
   {
@@ -5746,6 +5809,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE12__move_rangeEPaS4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EEPa"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
   },
   {
@@ -5810,6 +5885,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE18__construct_at_endIPdEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EEPd"
   },
   {
@@ -5870,18 +5949,22 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE12__move_rangeEPiS4_S4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE18__construct_at_endIPiEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EEPi"
   },
   {
@@ -5902,10 +5985,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE12__move_rangeEPxS4_S4_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EEPx"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
   },
   {
@@ -11305,11 +11396,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "referenced_type" : "_ZTIFRN7android10TextOutputES1_E",
-   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "self_type" : "_ZTIFRN7android10TextOutputES1_E",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
@@ -11825,7 +11916,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKNSt3__18functionIFiRKNS_6vectorIhNS_9allocatorIhEEEEbEEE"
@@ -11842,7 +11933,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -11859,7 +11950,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
@@ -11884,7 +11975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_7IBinderEEE",
@@ -11897,7 +11988,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android8BpBinderE"
@@ -11913,7 +12004,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android20RpcCertificateFormatE"
@@ -11929,7 +12020,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -11948,7 +12039,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -11964,7 +12055,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11984,7 +12075,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12000,7 +12091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__18optionalIjEE",
@@ -12013,7 +12104,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12098,7 +12189,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -12115,7 +12206,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12129,7 +12220,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12152,7 +12243,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12169,7 +12260,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12188,7 +12279,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12201,7 +12292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12215,7 +12306,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12234,7 +12325,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12250,7 +12341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12266,7 +12357,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -12282,7 +12373,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12296,7 +12387,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__16threadE"
@@ -12360,7 +12451,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12380,7 +12471,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
@@ -12397,7 +12488,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12420,7 +12511,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12471,7 +12562,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12484,7 +12575,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -12497,7 +12588,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
@@ -12526,7 +12617,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12543,7 +12634,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12559,7 +12650,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12572,7 +12663,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12585,7 +12676,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15204,6 +15295,22 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
    "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
    "parameters" :
@@ -15329,6 +15436,26 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
    "function_name" : "android::sp<android::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
    "parameters" :
@@ -15830,26 +15957,6 @@
   },
   {
    "function_name" : "android::sp<android::IMemory>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" :
-   [
-    "_ZTIN7android10AllocationE"
-   ]
-  },
-  {
-   "function_name" : "android::sp<android::IMemory>::operator=",
    "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
    "parameters" :
    [
@@ -15895,6 +16002,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
    "parameters" :
@@ -21713,78 +21836,78 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA15_Kc"
+     "referenced_type" : "_ZTIRA2_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA15_c"
+    "_ZTIA2_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA24_Kc"
+     "referenced_type" : "_ZTIRA3_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA24_c"
+    "_ZTIA3_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA34_Kc"
+     "referenced_type" : "_ZTIRA4_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA34_c"
+    "_ZTIA4_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA43_Kc"
+     "referenced_type" : "_ZTIRA5_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA43_c"
+    "_ZTIA5_c"
    ]
   },
   {
@@ -21808,21 +21931,40 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+     "referenced_type" : "_ZTIRA9_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    "_ZTIA9_c"
+   ]
+  },
+  {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+    },
+    {
+     "referenced_type" : "_ZTIRKPc"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIPc"
    ]
   },
   {
@@ -21864,6 +22006,25 @@
    ]
   },
   {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE"
+    },
+    {
+     "referenced_type" : "_ZTIRKy"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::MemoryBase::getMemory",
    "linker_set_key" : "_ZNK7android10MemoryBase9getMemoryEPiPj",
    "parameters" :
@@ -24311,7 +24472,7 @@
      "referenced_type" : "_ZTIPKN7android6ParcelE"
     },
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
      "default_arg" : true,
@@ -26281,19 +26442,19 @@
   {
    "linker_set_key" : "_ZN7android4aerrE",
    "name" : "android::aerr",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4alogE",
    "name" : "android::alog",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4aoutE",
    "name" : "android::aout",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
@@ -26784,7 +26945,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -26955,7 +27116,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -29388,8 +29549,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29676,8 +29837,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -34611,8 +34772,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned int>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -34627,8 +34788,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned long long>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -45253,7 +45414,7 @@
     {
      "access" : "private",
      "field_name" : "mTO",
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_arm_armv8-a_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android10TextOutput6BundleE",
@@ -49351,6 +49512,27 @@
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "field_name" : "pid",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "name" : "android::IServiceManager::ServiceDebugInfo",
+   "referenced_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "self_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "size" : 16,
+   "source_file" : "frameworks/native/libs/binder/include/binder/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -49523,6 +49705,10 @@
      "mangled_component_name" : "_ZN7android15IServiceManager26unregisterForNotificationsERKNS_8String16ERKNS_2spINS0_25LocalRegistrationCallbackEEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android15IServiceManager19getServiceDebugInfoEv"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
diff --git a/33/64/arm_arm64/source-based/libcodec2.so.lsdump b/33/64/arm_arm64/source-based/libcodec2.so.lsdump
index 0b43491..2306c61 100644
--- a/33/64/arm_arm64/source-based/libcodec2.so.lsdump
+++ b/33/64/arm_arm64/source-based/libcodec2.so.lsdump
@@ -2384,6 +2384,10 @@
     {
      "enum_field_value" : 16412,
      "name" : "(anonymous namespace)::kParamIndexAndroidChannelMask"
+    },
+    {
+     "enum_field_value" : 16413,
+     "name" : "(anonymous namespace)::kParamIndexTunnelPeekMode"
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_116C2ParamIndexKindE",
@@ -2448,7 +2452,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
-   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:408:1)",
+   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:412:1)",
    "referenced_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "self_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "size" : 4,
@@ -2772,7 +2776,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1584:5)",
+   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1588:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2875,7 +2879,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1810:5)",
+   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1814:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2888,6 +2892,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "C2PlatformConfig::UNSPECIFIED_PEEK"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "C2PlatformConfig::SPECIFIED_PEEK"
+    }
+   ],
+   "linker_set_key" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "name" : "C2PlatformConfig::tunnel_peek_mode_t",
+   "referenced_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "self_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/codec2/core/include/C2Config.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "C2PlatformConfig::NONE"
     },
     {
@@ -2913,7 +2938,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2930,7 +2955,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3041,7 +3066,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1967:5)",
+   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1971:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3058,7 +3083,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1087:5)",
+   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1091:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3075,7 +3100,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1068:5)",
+   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3109,7 +3134,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1434:5)",
+   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1438:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3126,7 +3151,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1557:5)",
+   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1561:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3143,7 +3168,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1941:5)",
+   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1945:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3160,7 +3185,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:753:5)",
+   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:757:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3177,7 +3202,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2321:5)",
+   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2325:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3194,7 +3219,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3211,7 +3236,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3274,7 +3299,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2201:5)",
+   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2205:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3320,7 +3345,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3337,7 +3362,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3354,7 +3379,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3371,7 +3396,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3388,7 +3413,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3405,7 +3430,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3422,7 +3447,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3439,7 +3464,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3477,7 +3502,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1834:5)",
+   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1838:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3494,7 +3519,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2370:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2374:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3536,7 +3561,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1598:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1602:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3553,7 +3578,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2249:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2253:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/33/64/arm_arm64/source-based/libcrypto.so.lsdump b/33/64/arm_arm64/source-based/libcrypto.so.lsdump
index 323250b..51c6329 100644
--- a/33/64/arm_arm64/source-based/libcrypto.so.lsdump
+++ b/33/64/arm_arm64/source-based/libcrypto.so.lsdump
@@ -3668,12 +3668,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5099,12 +5108,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5180,9 +5183,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5216,15 +5216,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6392,9 +6386,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8221,63 +8212,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9546,30 +9480,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -11147,7 +11057,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -11177,7 +11087,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -14490,111 +14400,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18314,7 +18119,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18581,7 +18386,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18629,7 +18434,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18917,7 +18722,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19287,18 +19092,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25533,39 +25326,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25968,18 +25728,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26130,18 +25878,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26157,21 +25893,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31788,24 +31509,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37331,15 +37034,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37979,15 +37673,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38452,7 +38137,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38609,33 +38294,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39212,15 +38870,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39277,7 +38926,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
@@ -39286,26 +38935,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
@@ -39313,8 +38944,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
@@ -39322,8 +38953,35 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
@@ -39698,15 +39356,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40787,7 +40436,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40813,16 +40462,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41279,16 +40918,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41842,47 +41471,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/arm_arm64/source-based/libdmabufheap.so.lsdump b/33/64/arm_arm64/source-based/libdmabufheap.so.lsdump
index 770d5d1..4b3448e 100644
--- a/33/64/arm_arm64/source-based/libdmabufheap.so.lsdump
+++ b/33/64/arm_arm64/source-based/libdmabufheap.so.lsdump
@@ -7708,8 +7708,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -7812,8 +7812,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8011,8 +8011,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_arm_armv8-a_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/33/64/arm_arm64/source-based/libgralloctypes.so.lsdump b/33/64/arm_arm64/source-based/libgralloctypes.so.lsdump
index 3749213..d9051a8 100644
--- a/33/64/arm_arm64/source-based/libgralloctypes.so.lsdump
+++ b/33/64/arm_arm64/source-based/libgralloctypes.so.lsdump
@@ -325,6 +325,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS9_8hidl_vecIhEEPFiSJ_PNS0_13OutputHidlVecEE"
   },
   {
@@ -336,6 +344,10 @@
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIN4aidl7android8hardware8graphics6common4RectENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNSD_8hidl_vecIhEEPFiSN_PNS0_13OutputHidlVecEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS7_8hidl_vecIhEEPFiSH_PNS0_13OutputHidlVecEE"
+  },
+  {
    "name" : "_ZN7android8gralloc415decodeBlendModeERKNS_8hardware8hidl_vecIhEEPN4aidl7android8hardware8graphics6common9BlendModeE"
   },
   {
@@ -475,18 +487,6 @@
    "name" : "_ZN7android8gralloc422decodeProtectedContentERKNS_8hardware8hidl_vecIhEEPy"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNS2_8optionalIT_EEPNS7_8hidl_vecIhEEPFiRKSG_PNS0_13OutputHidlVecEE"
-  },
-  {
    "name" : "_ZN7android8gralloc422encodeProtectedContentEyPNS_8hardware8hidl_vecIhEE"
   },
   {
diff --git a/33/64/arm_arm64/source-based/libhidlbase.so.lsdump b/33/64/arm_arm64/source-based/libhidlbase.so.lsdump
index a7f98cf..7e4f340 100644
--- a/33/64/arm_arm64/source-based/libhidlbase.so.lsdump
+++ b/33/64/arm_arm64/source-based/libhidlbase.so.lsdump
@@ -423,10 +423,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
   },
   {
@@ -2493,7 +2489,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE8wait_popEv"
+   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE4pushERKS6_"
   },
   {
    "binding" : "weak",
@@ -2596,10 +2592,6 @@
    "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
-  },
-  {
    "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
   },
   {
@@ -3368,10 +3360,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -3400,10 +3388,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__push_lookaheadERKS3_bj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_DUP_COUNTIPKcEET_S7_S7_Ri"
   },
   {
@@ -3424,6 +3408,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_nondupl_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__push_alternationEPNS_16__owns_one_stateIcEES6_"
   },
   {
@@ -3444,10 +3432,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE20__push_word_boundaryEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__parse_basic_reg_expIPKcEET_S7_S7_"
   },
   {
@@ -3460,11 +3444,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_RE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE23__parse_ERE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
   },
   {
    "binding" : "weak",
@@ -3552,6 +3536,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3572,6 +3560,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3660,6 +3656,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2wpINS1_4hidl4base4V1_05IBaseEEERNS_9allocatorIS7_EEEC2EjjSA_"
   },
   {
@@ -3668,6 +3668,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EjjS8_"
   },
   {
@@ -3700,6 +3708,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8functionIFvvEEERNS_9allocatorIS3_EEEC2EjjS6_"
   },
   {
@@ -3988,10 +4004,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -4016,10 +4028,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEERKT_"
   },
   {
@@ -4064,6 +4072,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware6Parcel10BufferInfoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
@@ -4112,6 +4124,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE6assignIPS4_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS4_NS_15iterator_traitsISB_E9referenceEEE5valueEvE4typeESB_SB_"
   },
   {
@@ -4120,11 +4136,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE8__appendEj"
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
+   "name" : "_ZNSt3__16vectorINS_7__stateIcEENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
   },
   {
    "binding" : "weak",
@@ -4184,10 +4204,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEjRKS4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
@@ -4232,7 +4248,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFvRKN7android8hardware8hidl_vecINS2_11hidl_stringEEEEEC2ERKS9_"
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
   },
   {
    "binding" : "weak",
@@ -9978,19 +9994,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::ProcessState>::~sp",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware12ProcessStateEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
    "parameters" :
@@ -20986,23 +20989,6 @@
    ]
   },
   {
-   "function_name" : "android::hardware::details::StatusOf",
-   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIvEE"
-    }
-   ],
-   "return_type" : "_ZTIN7android8hardware6ReturnIbEE",
-   "source_file" : "system/libhidl/base/include/hidl/Status.h",
-   "template_args" :
-   [
-    "_ZTIv",
-    "_ZTIb"
-   ]
-  },
-  {
    "access" : "protected",
    "function_name" : "android::hardware::BHwBinder::onTransact",
    "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
@@ -24432,8 +24418,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -25783,7 +25769,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/33/64/arm_arm64/source-based/libldacBT_abr.so.lsdump b/33/64/arm_arm64/source-based/libldacBT_abr.so.lsdump
index c83d20d..1f1d90a 100644
--- a/33/64/arm_arm64/source-based/libldacBT_abr.so.lsdump
+++ b/33/64/arm_arm64/source-based/libldacBT_abr.so.lsdump
@@ -3,6 +3,16 @@
  "builtin_types" :
  [
   {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
@@ -31,6 +41,42 @@
  "elf_functions" :
  [
   {
+   "name" : "ldacBT_alter_eqmid_priority"
+  },
+  {
+   "name" : "ldacBT_close_handle"
+  },
+  {
+   "name" : "ldacBT_encode"
+  },
+  {
+   "name" : "ldacBT_free_handle"
+  },
+  {
+   "name" : "ldacBT_get_bitrate"
+  },
+  {
+   "name" : "ldacBT_get_eqmid"
+  },
+  {
+   "name" : "ldacBT_get_error_code"
+  },
+  {
+   "name" : "ldacBT_get_handle"
+  },
+  {
+   "name" : "ldacBT_get_sampling_freq"
+  },
+  {
+   "name" : "ldacBT_get_version"
+  },
+  {
+   "name" : "ldacBT_init_handle_encode"
+  },
+  {
+   "name" : "ldacBT_set_eqmid"
+  },
+  {
    "name" : "ldac_ABR_Init"
   },
   {
@@ -44,6 +90,90 @@
   },
   {
    "name" : "ldac_ABR_set_thresholds"
+  },
+  {
+   "name" : "ldaclib_check_nlnn_shift"
+  },
+  {
+   "name" : "ldaclib_clear_error_code"
+  },
+  {
+   "name" : "ldaclib_clear_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_encode"
+  },
+  {
+   "name" : "ldaclib_flush_encode"
+  },
+  {
+   "name" : "ldaclib_free_encode"
+  },
+  {
+   "name" : "ldaclib_free_handle"
+  },
+  {
+   "name" : "ldaclib_get_branch_version"
+  },
+  {
+   "name" : "ldaclib_get_channel"
+  },
+  {
+   "name" : "ldaclib_get_channel_config_index"
+  },
+  {
+   "name" : "ldaclib_get_config_info"
+  },
+  {
+   "name" : "ldaclib_get_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_get_encode_setting"
+  },
+  {
+   "name" : "ldaclib_get_error_code"
+  },
+  {
+   "name" : "ldaclib_get_frame_samples"
+  },
+  {
+   "name" : "ldaclib_get_handle"
+  },
+  {
+   "name" : "ldaclib_get_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_get_major_version"
+  },
+  {
+   "name" : "ldaclib_get_minor_version"
+  },
+  {
+   "name" : "ldaclib_get_nlnn"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate_index"
+  },
+  {
+   "name" : "ldaclib_get_version"
+  },
+  {
+   "name" : "ldaclib_init_encode"
+  },
+  {
+   "name" : "ldaclib_set_config_info"
+  },
+  {
+   "name" : "ldaclib_set_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_set_encode_info"
+  },
+  {
+   "name" : "ldaclib_set_frame_header"
   }
  ],
  "elf_objects" : [],
diff --git a/33/64/arm_arm64/source-based/libmedia_omx.so.lsdump b/33/64/arm_arm64/source-based/libmedia_omx.so.lsdump
index 9fd2f04..e1324e1 100644
--- a/33/64/arm_arm64/source-based/libmedia_omx.so.lsdump
+++ b/33/64/arm_arm64/source-based/libmedia_omx.so.lsdump
@@ -34177,7 +34177,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -34232,13 +34232,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_arm_armv8-a_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/arm_arm64/source-based/libnl.so.lsdump b/33/64/arm_arm64/source-based/libnl.so.lsdump
index 3c5401d..4cbbaec 100644
--- a/33/64/arm_arm64/source-based/libnl.so.lsdump
+++ b/33/64/arm_arm64/source-based/libnl.so.lsdump
@@ -4194,7 +4194,7 @@
      "referenced_type" : "_ZTIP7nl_sock"
     },
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4218,7 +4218,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4230,7 +4230,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4278,7 +4278,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_arm_armv8-a_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
diff --git a/33/64/arm_arm64/source-based/libprocessgroup.so.lsdump b/33/64/arm_arm64/source-based/libprocessgroup.so.lsdump
index dc09a99..1e02fc2 100644
--- a/33/64/arm_arm64/source-based/libprocessgroup.so.lsdump
+++ b/33/64/arm_arm64/source-based/libprocessgroup.so.lsdump
@@ -134,6 +134,12 @@
    "name" : "_Z25setProcessGroupSwappinessjii"
   },
   {
+   "name" : "_Z27removeAllEmptyProcessGroupsv"
+  },
+  {
+   "name" : "_Z30removeAllProcessGroupsInternalb"
+  },
+  {
    "name" : "_Z31DropTaskProfilesResourceCachingv"
   },
   {
diff --git a/33/64/arm_arm64/source-based/libssl.so.lsdump b/33/64/arm_arm64/source-based/libssl.so.lsdump
index bfd411e..ff6f8eb 100644
--- a/33/64/arm_arm64/source-based/libssl.so.lsdump
+++ b/33/64/arm_arm64/source-based/libssl.so.lsdump
@@ -893,6 +893,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8103,6 +8106,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14810,15 +14828,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19322,7 +19331,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24691,20 +24700,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump b/33/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump
index ad7c68e..09366c9 100644
--- a/33/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump
+++ b/33/64/arm_arm64/source-based/libstagefright_foundation.so.lsdump
@@ -10603,7 +10603,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -23817,7 +23817,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -23859,13 +23859,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/33/64/arm_arm64/source-based/libstagefright_omx.so.lsdump b/33/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
index 3bcba93..029c5f9 100644
--- a/33/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
+++ b/33/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
@@ -20950,7 +20950,7 @@
    "referenced_type" : "_ZTIKN7android7String8E",
    "self_type" : "_ZTIPKN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -22183,7 +22183,7 @@
    "referenced_type" : "_ZTIN7android7String8E",
    "self_type" : "_ZTIPN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -38467,7 +38467,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -38522,13 +38522,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_arm_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_arm_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/arm_arm64/source-based/libui.so.lsdump b/33/64/arm_arm64/source-based/libui.so.lsdump
index c17ff72..410bb8c 100644
--- a/33/64/arm_arm64/source-based/libui.so.lsdump
+++ b/33/64/arm_arm64/source-based/libui.so.lsdump
@@ -1231,10 +1231,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -2406,10 +2402,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeISC_PvEEEE"
   },
   {
@@ -2426,10 +2418,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -2490,6 +2478,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEE9push_backEOS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -2538,10 +2530,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
@@ -2686,18 +2674,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFffEEC2INS_6__bindIRFffRKN7android10ColorSpace18TransferParametersEEJRKNS_12placeholders4__phILi1EEES9_EEEvEET_"
   },
   {
@@ -16533,12 +16509,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
diff --git a/33/64/arm_arm64/source-based/libunwindstack.so.lsdump b/33/64/arm_arm64/source-based/libunwindstack.so.lsdump
index c8d19d2..d249fcf 100644
--- a/33/64/arm_arm64/source-based/libunwindstack.so.lsdump
+++ b/33/64/arm_arm64/source-based/libunwindstack.so.lsdump
@@ -3343,7 +3343,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
-   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:45:1)",
+   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:44:1)",
    "referenced_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "self_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "size" : 1,
diff --git a/33/64/arm_arm64/source-based/libutils.so.lsdump b/33/64/arm_arm64/source-based/libutils.so.lsdump
index fa75432..9bfe756 100644
--- a/33/64/arm_arm64/source-based/libutils.so.lsdump
+++ b/33/64/arm_arm64/source-based/libutils.so.lsdump
@@ -1226,6 +1226,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
diff --git a/33/64/x86/source-based/android.hardware.camera.device-V1-ndk.so.lsdump b/33/64/x86/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
index 3bd61bf..e2c8a9b 100644
--- a/33/64/x86/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
+++ b/33/64/x86/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
@@ -7110,7 +7110,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7126,7 +7126,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7915,7 +7915,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device22BpCameraOfflineSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8550,7 +8550,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8566,7 +8566,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8829,7 +8829,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device28ICameraOfflineSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -9038,7 +9038,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPK7AParcel"
diff --git a/33/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump b/33/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 8d6cbdd..ec8b5f0 100644
--- a/33/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/33/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -250,7 +250,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -554,7 +554,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -847,7 +847,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -929,11 +929,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -950,11 +950,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1043,11 +1043,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3318,7 +3318,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3336,7 +3336,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3357,7 +3357,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3441,7 +3441,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5168,7 +5168,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -5186,7 +5186,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5222,7 +5222,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5231,7 +5231,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5240,7 +5240,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -5258,7 +5258,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -5294,7 +5294,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5348,7 +5348,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5357,7 +5357,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5366,7 +5366,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5411,7 +5411,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5465,7 +5465,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -6554,7 +6554,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -8067,7 +8067,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -8107,7 +8107,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9729,7 +9729,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9769,7 +9769,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9957,7 +9957,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -10007,7 +10007,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10017,7 +10017,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10027,7 +10027,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10037,7 +10037,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10220,7 +10220,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -10387,7 +10387,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10572,7 +10572,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -10625,7 +10625,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -10655,7 +10655,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10824,7 +10824,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -11198,7 +11198,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11214,7 +11214,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11262,7 +11262,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11304,7 +11304,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11400,7 +11400,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11437,7 +11437,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11484,7 +11484,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11535,7 +11535,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11582,7 +11582,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11658,7 +11658,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11812,7 +11812,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -11898,7 +11898,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11919,7 +11919,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11955,7 +11955,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -12107,7 +12107,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/locale.h"
   },
   {
    "alignment" : 4,
@@ -12290,7 +12290,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 276,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -12306,7 +12306,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -12327,7 +12327,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -12478,7 +12478,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -12499,7 +12499,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -12586,7 +12586,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 276,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -12668,7 +12668,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -12807,7 +12807,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -12823,7 +12823,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -12844,7 +12844,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -12926,7 +12926,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -12942,7 +12942,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -12972,7 +12972,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -13348,12 +13348,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -16148,12 +16148,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -16171,11 +16171,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -16192,12 +16192,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/x86/source-based/config.ini b/33/64/x86/source-based/config.ini
deleted file mode 100644
index a3a2a44..0000000
--- a/33/64/x86/source-based/config.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-allow_adding_removing_weak_symbols = true
diff --git a/33/64/x86/source-based/libRSCpuRef.so.lsdump b/33/64/x86/source-based/libRSCpuRef.so.lsdump
index 4ec96a2..0743ff5 100644
--- a/33/64/x86/source-based/libRSCpuRef.so.lsdump
+++ b/33/64/x86/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -439,7 +439,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -538,7 +538,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -646,7 +646,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -709,7 +709,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -790,7 +790,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -842,7 +842,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -5944,7 +5944,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6665,11 +6665,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7038,11 +7038,11 @@
     }
    ],
    "linker_set_key" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/android/dlext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/android/dlext.h:41:1)",
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7403,11 +7403,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7496,11 +7496,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -10584,7 +10584,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10623,7 +10623,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10662,7 +10662,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -12975,7 +12975,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -12993,7 +12993,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -15179,7 +15179,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
+   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
    "source_file" : "frameworks/rs/cpu_ref/rsCpuExecutable.h"
   },
   {
@@ -23720,7 +23720,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -23801,7 +23801,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -23882,7 +23882,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -23909,7 +23909,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -23918,7 +23918,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -23927,7 +23927,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -23963,7 +23963,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -23996,8 +23996,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8timespec",
    "name" : "timespec *",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/__threading_support"
   },
@@ -24008,7 +24008,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -24107,7 +24107,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24125,7 +24125,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24143,7 +24143,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24998,7 +24998,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -25007,7 +25007,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25169,7 +25169,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -25292,8 +25292,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25742,8 +25742,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -28139,7 +28139,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32063,7 +32063,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -32207,7 +32207,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -32279,7 +32279,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -32450,7 +32450,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -32618,7 +32618,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -36231,7 +36231,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -36274,7 +36274,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -36544,7 +36544,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -36574,7 +36574,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -36772,7 +36772,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36822,7 +36822,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36832,7 +36832,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36842,7 +36842,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36852,7 +36852,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37151,7 +37151,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -37334,7 +37334,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -37600,7 +37600,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -37837,7 +37837,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -37867,7 +37867,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -38199,7 +38199,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -38676,7 +38676,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38692,7 +38692,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38827,7 +38827,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38987,7 +38987,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -39083,7 +39083,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39150,7 +39150,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 36,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -39166,7 +39166,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -39371,7 +39371,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -39422,7 +39422,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39469,7 +39469,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -39587,7 +39587,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -40011,7 +40011,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -40102,7 +40102,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -40188,7 +40188,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -40209,7 +40209,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -40245,7 +40245,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -40397,7 +40397,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/locale.h"
   },
   {
    "alignment" : 4,
@@ -40560,7 +40560,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -40581,7 +40581,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -40805,7 +40805,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -40836,7 +40836,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 2,
@@ -40966,7 +40966,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -40987,7 +40987,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -41146,7 +41146,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -41245,7 +41245,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -41263,8 +41263,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -41327,7 +41327,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -41343,7 +41343,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -41425,7 +41425,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -41441,7 +41441,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -41471,7 +41471,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -41847,12 +41847,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -48096,7 +48096,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48177,7 +48177,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -48952,7 +48952,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48969,7 +48969,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48979,7 +48979,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48996,7 +48996,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -52556,12 +52556,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52579,11 +52579,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52600,12 +52600,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/x86/source-based/libRSDriver.so.lsdump b/33/64/x86/source-based/libRSDriver.so.lsdump
index bd24f6d..bf98f59 100644
--- a/33/64/x86/source-based/libRSDriver.so.lsdump
+++ b/33/64/x86/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -151,7 +151,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -304,7 +304,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -331,7 +331,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -457,7 +457,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -511,7 +511,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -556,7 +556,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -671,7 +671,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4668,7 +4668,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5401,11 +5401,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6174,11 +6174,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6309,11 +6309,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8372,7 +8372,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8390,7 +8390,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8429,7 +8429,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10172,7 +10172,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10570,7 +10570,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10594,7 +10594,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11281,7 +11281,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22298,7 +22298,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22315,7 +22315,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22338,7 +22338,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22367,7 +22367,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -22381,7 +22381,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22404,7 +22404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22424,7 +22424,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22438,7 +22438,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22452,7 +22452,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22466,7 +22466,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIPN9RsdShader13StateBasedKeyE",
@@ -22480,7 +22480,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22509,7 +22509,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22532,7 +22532,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22545,7 +22545,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22562,7 +22562,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22576,7 +22576,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPPKc"
@@ -22598,7 +22598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22617,7 +22617,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22651,7 +22651,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22685,7 +22685,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22698,7 +22698,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22711,7 +22711,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24350,7 +24350,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -24431,7 +24431,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24467,7 +24467,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24494,7 +24494,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -24530,7 +24530,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -24584,7 +24584,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -25016,7 +25016,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25025,7 +25025,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25043,7 +25043,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25682,7 +25682,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -26453,8 +26453,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -29210,7 +29210,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -29345,7 +29345,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -29444,7 +29444,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -29644,7 +29644,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -31832,7 +31832,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32032,7 +32032,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32042,7 +32042,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32270,7 +32270,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32280,7 +32280,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32290,7 +32290,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32300,7 +32300,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -32418,7 +32418,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -32631,7 +32631,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -32846,7 +32846,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -33031,7 +33031,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -33100,7 +33100,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -33130,7 +33130,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -33533,7 +33533,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -34066,7 +34066,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34082,7 +34082,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34269,7 +34269,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34332,7 +34332,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34444,7 +34444,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34566,7 +34566,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34732,7 +34732,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34783,7 +34783,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34918,7 +34918,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -35010,7 +35010,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35386,7 +35386,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -35472,7 +35472,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35524,7 +35524,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35560,7 +35560,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -35800,7 +35800,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -35821,7 +35821,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -36084,7 +36084,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -36105,7 +36105,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -36332,7 +36332,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36431,7 +36431,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -36449,8 +36449,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdGL.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_shared/obj/frameworks/rs/driver/rsdGL.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -36513,7 +36513,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36697,7 +36697,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -36718,7 +36718,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -36800,7 +36800,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -36816,7 +36816,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -36862,7 +36862,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -37238,12 +37238,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "access" : "protected",
@@ -44451,12 +44451,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -44474,11 +44474,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -44518,12 +44518,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/x86/source-based/libRS_internal.so.lsdump b/33/64/x86/source-based/libRS_internal.so.lsdump
index f14268a..6573d79 100644
--- a/33/64/x86/source-based/libRS_internal.so.lsdump
+++ b/33/64/x86/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -358,7 +358,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -520,7 +520,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -574,7 +574,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -736,7 +736,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -788,7 +788,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_f",
@@ -6236,7 +6236,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7236,11 +7236,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8473,11 +8473,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8608,11 +8608,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8743,11 +8743,11 @@
     }
    ],
    "linker_set_key" : "_ZTI8$SHUT_RD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h:59:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h:59:1)",
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11705,7 +11705,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11723,7 +11723,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11762,7 +11762,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13829,7 +13829,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13886,7 +13886,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -15900,7 +15900,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -16969,7 +16969,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -17240,7 +17240,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -17256,7 +17256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17273,7 +17273,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17290,7 +17290,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIP13ANativeWindow",
@@ -17318,7 +17318,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript10AllocationE"
@@ -17334,7 +17334,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -17347,7 +17347,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17369,7 +17369,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17391,7 +17391,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17404,7 +17404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17417,7 +17417,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19925,7 +19925,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21737,7 +21737,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21761,7 +21761,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -22675,7 +22675,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22687,7 +22687,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7IStreamE"
@@ -22719,7 +22719,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22735,7 +22735,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22751,7 +22751,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -22773,7 +22773,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22789,7 +22789,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -23830,7 +23830,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -23924,7 +23924,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -27998,7 +27998,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -28017,7 +28017,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -28042,7 +28042,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -28058,7 +28058,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7OStreamE"
@@ -31905,7 +31905,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35571,7 +35571,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35937,7 +35937,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -36072,7 +36072,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36189,7 +36189,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36225,7 +36225,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36243,7 +36243,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36288,7 +36288,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -36315,7 +36315,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -36351,7 +36351,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36477,7 +36477,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36486,7 +36486,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36504,7 +36504,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37287,7 +37287,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37314,7 +37314,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37503,7 +37503,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -37743,8 +37743,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37986,8 +37986,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37995,8 +37995,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38004,8 +38004,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38013,8 +38013,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40878,7 +40878,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -40950,7 +40950,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -45126,7 +45126,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -45270,7 +45270,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -45360,7 +45360,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -45481,7 +45481,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45631,7 +45631,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49609,7 +49609,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49686,7 +49686,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *const",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/memory"
@@ -49969,7 +49969,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49979,7 +49979,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -50059,7 +50059,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -50167,7 +50167,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50217,7 +50217,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50227,7 +50227,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50237,7 +50237,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50247,7 +50247,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50649,7 +50649,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -50832,7 +50832,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51120,7 +51120,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "generic",
@@ -51328,7 +51328,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -51397,7 +51397,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -51427,7 +51427,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -52072,7 +52072,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52511,7 +52511,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "encoding",
@@ -52854,7 +52854,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52870,7 +52870,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53098,7 +53098,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53137,7 +53137,7 @@
     {
      "field_name" : "face",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "next",
@@ -53452,7 +53452,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53467,7 +53467,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -53563,7 +53563,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -53774,7 +53774,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -54089,7 +54089,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -54140,7 +54140,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54261,7 +54261,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -54363,7 +54363,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54960,7 +54960,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -55072,7 +55072,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -55158,7 +55158,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -55210,7 +55210,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55246,7 +55246,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -55398,7 +55398,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/locale.h"
   },
   {
    "alignment" : 4,
@@ -55550,7 +55550,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -55587,7 +55587,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -55608,7 +55608,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55629,7 +55629,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55675,7 +55675,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 28,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55925,7 +55925,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -55956,7 +55956,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 2,
@@ -56076,7 +56076,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -56112,7 +56112,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -56133,7 +56133,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -56169,7 +56169,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -56411,7 +56411,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -56510,7 +56510,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -56531,7 +56531,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -56592,7 +56592,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -56680,7 +56680,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -56701,7 +56701,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -56783,7 +56783,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -56799,7 +56799,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -56829,7 +56829,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -57205,12 +57205,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -57477,12 +57477,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h:74:3)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h:74:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -57500,11 +57500,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_Ut_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h:75:5)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h:75:5)",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -69879,12 +69879,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -69902,11 +69902,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -69923,12 +69923,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -87475,7 +87475,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -91506,7 +91506,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -100800,17 +100800,17 @@
    [
     {
      "field_name" : "__first_",
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__begin_",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_cap_",
@@ -104526,7 +104526,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -104546,7 +104546,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -114149,7 +114149,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -118953,7 +118953,7 @@
    "source_file" : "external/libcxx/include/memory",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -125967,7 +125967,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -129653,7 +129653,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -131418,7 +131418,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139598,7 +139598,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139832,7 +139832,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140482,7 +140482,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -141829,7 +141829,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -145876,7 +145876,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146516,7 +146516,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147152,7 +147152,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147386,7 +147386,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -148036,7 +148036,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -148913,7 +148913,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -151649,7 +151649,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -166186,7 +166186,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -195790,7 +195790,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
diff --git a/33/64/x86/source-based/libaudioutils.so.lsdump b/33/64/x86/source-based/libaudioutils.so.lsdump
index 370cca5..263143f 100644
--- a/33/64/x86/source-based/libaudioutils.so.lsdump
+++ b/33/64/x86/source-based/libaudioutils.so.lsdump
@@ -120,6 +120,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIA2_15audio_devices_t",
+   "name" : "audio_devices_t[2]",
+   "referenced_type" : "_ZTI15audio_devices_t",
+   "self_type" : "_ZTIA2_15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIA2_A256_f",
    "name" : "float[2][256]",
    "referenced_type" : "_ZTIA256_f",
@@ -3424,7 +3433,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:335:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:357:1)",
    "referenced_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "self_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "size" : 4,
@@ -3461,7 +3470,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:577:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:599:1)",
    "referenced_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "self_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "size" : 4,
@@ -8803,6 +8812,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIA2_K15audio_devices_t",
+   "name" : "const audio_devices_t[2]",
+   "referenced_type" : "_ZTIA2_15audio_devices_t",
+   "self_type" : "_ZTIA2_K15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIA34_K15audio_devices_t",
    "name" : "const audio_devices_t[34]",
    "referenced_type" : "_ZTIA34_15audio_devices_t",
@@ -8954,7 +8973,7 @@
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIK4$_12",
-   "name" : "const (lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "const (lambda at system/media/audio/include/system/audio.h:1313:41)",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTIK4$_12",
    "size" : 1,
@@ -11025,7 +11044,7 @@
    "alignment" : 1,
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI4$_12",
-   "name" : "(lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "(lambda at system/media/audio/include/system/audio.h:1313:41)",
    "record_kind" : "class",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTI4$_12",
@@ -11087,7 +11106,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN10audio_portUt_E",
-   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:673:5)",
+   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:695:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN10audio_portUt_E",
    "self_type" : "_ZTIN10audio_portUt_E",
@@ -11113,7 +11132,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN13audio_port_v7Ut_E",
-   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:721:5)",
+   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:743:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN13audio_port_v7Ut_E",
    "self_type" : "_ZTIN13audio_port_v7Ut_E",
@@ -11165,7 +11184,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN17audio_port_configUt_E",
-   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:607:5)",
+   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:629:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN17audio_port_configUt_E",
    "self_type" : "_ZTIN17audio_port_configUt_E",
@@ -11187,7 +11206,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN25audio_port_config_mix_extUt_E",
-   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:551:5)",
+   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:573:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN25audio_port_config_mix_extUt_E",
    "self_type" : "_ZTIN25audio_port_config_mix_extUt_E",
diff --git a/33/64/x86/source-based/libbinder.so.lsdump b/33/64/x86/source-based/libbinder.so.lsdump
index dd03ccc..e81ec8e 100644
--- a/33/64/x86/source-based/libbinder.so.lsdump
+++ b/33/64/x86/source-based/libbinder.so.lsdump
@@ -1686,6 +1686,9 @@
    "name" : "_ZN7android18ServiceManagerShim17getConnectionInfoERKNS_8String16E"
   },
   {
+   "name" : "_ZN7android18ServiceManagerShim19getServiceDebugInfoEv"
+  },
+  {
    "name" : "_ZN7android18ServiceManagerShim20getDeclaredInstancesERKNS_8String16E"
   },
   {
@@ -1957,6 +1960,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
   },
   {
@@ -1989,6 +1996,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
   },
   {
@@ -2113,10 +2124,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
   },
   {
@@ -2129,6 +2136,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
   },
   {
@@ -3440,19 +3451,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3460,7 +3471,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_"
+   "name" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3471,6 +3486,10 @@
    "name" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_"
+  },
+  {
    "name" : "_ZNK7android10MemoryBase9getMemoryEPiPj"
   },
   {
@@ -3737,6 +3756,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
   },
   {
@@ -4588,6 +4611,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -4640,6 +4679,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEED2Ev"
   },
   {
@@ -4652,6 +4699,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__thread_proxyINS_5tupleIJNS_10unique_ptrINS_15__thread_structENS_14default_deleteIS3_EEEEPFvON7android2spINS7_9RpcServerEEEESA_EEEEEPvSF_"
   },
   {
@@ -4760,10 +4811,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
   },
   {
@@ -5448,6 +5495,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
   },
   {
@@ -5524,10 +5575,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -5564,6 +5611,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
   },
   {
@@ -5692,6 +5747,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
   },
   {
@@ -5700,6 +5759,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE12__move_rangeEPaS4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EEPa"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
   },
   {
@@ -5764,6 +5835,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE18__construct_at_endIPdEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EEPd"
   },
   {
@@ -5824,18 +5899,22 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE12__move_rangeEPiS4_S4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE18__construct_at_endIPiEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EEPi"
   },
   {
@@ -5856,10 +5935,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE12__move_rangeEPxS4_S4_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EEPx"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
   },
   {
@@ -11259,11 +11346,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "referenced_type" : "_ZTIFRN7android10TextOutputES1_E",
-   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "self_type" : "_ZTIFRN7android10TextOutputES1_E",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
@@ -11779,7 +11866,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKNSt3__18functionIFiRKNS_6vectorIhNS_9allocatorIhEEEEbEEE"
@@ -11796,7 +11883,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -11813,7 +11900,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
@@ -11838,7 +11925,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_7IBinderEEE",
@@ -11851,7 +11938,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android8BpBinderE"
@@ -11867,7 +11954,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android20RpcCertificateFormatE"
@@ -11883,7 +11970,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -11902,7 +11989,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -11918,7 +12005,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11938,7 +12025,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -11954,7 +12041,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__18optionalIjEE",
@@ -11967,7 +12054,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12052,7 +12139,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -12069,7 +12156,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12083,7 +12170,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12106,7 +12193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12123,7 +12210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12142,7 +12229,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12155,7 +12242,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12169,7 +12256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12188,7 +12275,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12204,7 +12291,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12220,7 +12307,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -12236,7 +12323,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12250,7 +12337,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__16threadE"
@@ -12314,7 +12401,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12334,7 +12421,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
@@ -12351,7 +12438,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12374,7 +12461,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12425,7 +12512,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12438,7 +12525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -12451,7 +12538,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
@@ -12480,7 +12567,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12497,7 +12584,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12513,7 +12600,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12526,7 +12613,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12539,7 +12626,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15158,6 +15245,22 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
    "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
    "parameters" :
@@ -15283,6 +15386,26 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
    "function_name" : "android::sp<android::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
    "parameters" :
@@ -15784,26 +15907,6 @@
   },
   {
    "function_name" : "android::sp<android::IMemory>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" :
-   [
-    "_ZTIN7android10AllocationE"
-   ]
-  },
-  {
-   "function_name" : "android::sp<android::IMemory>::operator=",
    "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
    "parameters" :
    [
@@ -15849,6 +15952,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
    "parameters" :
@@ -21667,78 +21786,78 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA15_Kc"
+     "referenced_type" : "_ZTIRA2_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA15_c"
+    "_ZTIA2_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA24_Kc"
+     "referenced_type" : "_ZTIRA3_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA24_c"
+    "_ZTIA3_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA34_Kc"
+     "referenced_type" : "_ZTIRA4_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA34_c"
+    "_ZTIA4_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA43_Kc"
+     "referenced_type" : "_ZTIRA5_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA43_c"
+    "_ZTIA5_c"
    ]
   },
   {
@@ -21762,21 +21881,40 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+     "referenced_type" : "_ZTIRA9_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    "_ZTIA9_c"
+   ]
+  },
+  {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+    },
+    {
+     "referenced_type" : "_ZTIRKPc"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIPc"
    ]
   },
   {
@@ -21818,6 +21956,25 @@
    ]
   },
   {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE"
+    },
+    {
+     "referenced_type" : "_ZTIRKy"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::MemoryBase::getMemory",
    "linker_set_key" : "_ZNK7android10MemoryBase9getMemoryEPiPj",
    "parameters" :
@@ -24265,7 +24422,7 @@
      "referenced_type" : "_ZTIPKN7android6ParcelE"
     },
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
      "default_arg" : true,
@@ -26235,19 +26392,19 @@
   {
    "linker_set_key" : "_ZN7android4aerrE",
    "name" : "android::aerr",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4alogE",
    "name" : "android::alog",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4aoutE",
    "name" : "android::aout",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
@@ -26738,7 +26895,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -26909,7 +27066,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -29342,8 +29499,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29630,8 +29787,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -34565,8 +34722,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned int>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -34581,8 +34738,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned long long>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -45207,7 +45364,7 @@
     {
      "access" : "private",
      "field_name" : "mTO",
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android10TextOutput6BundleE",
@@ -49305,6 +49462,27 @@
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "field_name" : "pid",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "name" : "android::IServiceManager::ServiceDebugInfo",
+   "referenced_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "self_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "size" : 16,
+   "source_file" : "frameworks/native/libs/binder/include/binder/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -49477,6 +49655,10 @@
      "mangled_component_name" : "_ZN7android15IServiceManager26unregisterForNotificationsERKNS_8String16ERKNS_2spINS0_25LocalRegistrationCallbackEEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android15IServiceManager19getServiceDebugInfoEv"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
diff --git a/33/64/x86/source-based/libcodec2.so.lsdump b/33/64/x86/source-based/libcodec2.so.lsdump
index ca745df..a076cfb 100644
--- a/33/64/x86/source-based/libcodec2.so.lsdump
+++ b/33/64/x86/source-based/libcodec2.so.lsdump
@@ -2383,6 +2383,10 @@
     {
      "enum_field_value" : 16412,
      "name" : "(anonymous namespace)::kParamIndexAndroidChannelMask"
+    },
+    {
+     "enum_field_value" : 16413,
+     "name" : "(anonymous namespace)::kParamIndexTunnelPeekMode"
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_116C2ParamIndexKindE",
@@ -2447,7 +2451,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
-   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:408:1)",
+   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:412:1)",
    "referenced_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "self_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "size" : 4,
@@ -2771,7 +2775,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1584:5)",
+   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1588:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2874,7 +2878,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1810:5)",
+   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1814:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2887,6 +2891,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "C2PlatformConfig::UNSPECIFIED_PEEK"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "C2PlatformConfig::SPECIFIED_PEEK"
+    }
+   ],
+   "linker_set_key" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "name" : "C2PlatformConfig::tunnel_peek_mode_t",
+   "referenced_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "self_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/codec2/core/include/C2Config.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "C2PlatformConfig::NONE"
     },
     {
@@ -2912,7 +2937,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2929,7 +2954,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3040,7 +3065,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1967:5)",
+   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1971:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3057,7 +3082,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1087:5)",
+   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1091:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3074,7 +3099,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1068:5)",
+   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3108,7 +3133,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1434:5)",
+   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1438:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3125,7 +3150,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1557:5)",
+   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1561:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3142,7 +3167,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1941:5)",
+   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1945:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3159,7 +3184,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:753:5)",
+   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:757:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3176,7 +3201,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2321:5)",
+   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2325:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3193,7 +3218,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3210,7 +3235,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3273,7 +3298,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2201:5)",
+   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2205:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3319,7 +3344,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3336,7 +3361,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3353,7 +3378,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3370,7 +3395,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3387,7 +3412,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3404,7 +3429,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3421,7 +3446,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3438,7 +3463,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3476,7 +3501,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1834:5)",
+   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1838:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3493,7 +3518,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2370:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2374:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3535,7 +3560,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1598:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1602:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3552,7 +3577,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2249:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2253:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/33/64/x86/source-based/libcrypto.so.lsdump b/33/64/x86/source-based/libcrypto.so.lsdump
index eaf07a4..898ac65 100644
--- a/33/64/x86/source-based/libcrypto.so.lsdump
+++ b/33/64/x86/source-based/libcrypto.so.lsdump
@@ -3657,12 +3657,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5085,12 +5094,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5166,9 +5169,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5202,15 +5202,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6378,9 +6372,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8207,63 +8198,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9532,30 +9466,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -11133,7 +11043,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -11163,7 +11073,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -14476,111 +14386,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18288,7 +18093,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18555,7 +18360,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18603,7 +18408,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18891,7 +18696,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19261,18 +19066,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25507,39 +25300,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25942,18 +25702,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26104,18 +25852,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26131,21 +25867,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31762,24 +31483,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37305,15 +37008,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37953,15 +37647,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38426,7 +38111,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38583,33 +38268,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39186,15 +38844,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39251,7 +38900,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
@@ -39260,26 +38909,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
@@ -39287,8 +38918,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
@@ -39296,8 +38927,35 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
@@ -39672,15 +39330,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40761,7 +40410,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40787,16 +40436,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41253,16 +40892,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41816,47 +41445,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/x86/source-based/libdmabufheap.so.lsdump b/33/64/x86/source-based/libdmabufheap.so.lsdump
index 11d39d7..b3ea332 100644
--- a/33/64/x86/source-based/libdmabufheap.so.lsdump
+++ b/33/64/x86/source-based/libdmabufheap.so.lsdump
@@ -7706,8 +7706,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -7810,8 +7810,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8009,8 +8009,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/33/64/x86/source-based/libgralloctypes.so.lsdump b/33/64/x86/source-based/libgralloctypes.so.lsdump
index 308d38a..5ae782f 100644
--- a/33/64/x86/source-based/libgralloctypes.so.lsdump
+++ b/33/64/x86/source-based/libgralloctypes.so.lsdump
@@ -324,6 +324,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS9_8hidl_vecIhEEPFiSJ_PNS0_13OutputHidlVecEE"
   },
   {
@@ -335,6 +343,10 @@
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIN4aidl7android8hardware8graphics6common4RectENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNSD_8hidl_vecIhEEPFiSN_PNS0_13OutputHidlVecEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS7_8hidl_vecIhEEPFiSH_PNS0_13OutputHidlVecEE"
+  },
+  {
    "name" : "_ZN7android8gralloc415decodeBlendModeERKNS_8hardware8hidl_vecIhEEPN4aidl7android8hardware8graphics6common9BlendModeE"
   },
   {
@@ -474,18 +486,6 @@
    "name" : "_ZN7android8gralloc422decodeProtectedContentERKNS_8hardware8hidl_vecIhEEPy"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNS2_8optionalIT_EEPNS7_8hidl_vecIhEEPFiRKSG_PNS0_13OutputHidlVecEE"
-  },
-  {
    "name" : "_ZN7android8gralloc422encodeProtectedContentEyPNS_8hardware8hidl_vecIhEE"
   },
   {
diff --git a/33/64/x86/source-based/libhidlbase.so.lsdump b/33/64/x86/source-based/libhidlbase.so.lsdump
index c0b68e8..3ca5ae8 100644
--- a/33/64/x86/source-based/libhidlbase.so.lsdump
+++ b/33/64/x86/source-based/libhidlbase.so.lsdump
@@ -422,10 +422,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
   },
   {
@@ -2492,7 +2488,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE8wait_popEv"
+   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE4pushERKS6_"
   },
   {
    "binding" : "weak",
@@ -2595,10 +2591,6 @@
    "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
-  },
-  {
    "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
   },
   {
@@ -3367,10 +3359,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -3399,10 +3387,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__push_lookaheadERKS3_bj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_DUP_COUNTIPKcEET_S7_S7_Ri"
   },
   {
@@ -3423,6 +3407,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_nondupl_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__push_alternationEPNS_16__owns_one_stateIcEES6_"
   },
   {
@@ -3443,10 +3431,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE20__push_word_boundaryEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__parse_basic_reg_expIPKcEET_S7_S7_"
   },
   {
@@ -3459,11 +3443,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_RE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE23__parse_ERE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
   },
   {
    "binding" : "weak",
@@ -3555,6 +3539,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3575,6 +3563,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3667,6 +3663,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EjjS8_"
   },
   {
@@ -3695,6 +3699,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8functionIFvvEEERNS_9allocatorIS3_EEEC2EjjS6_"
   },
   {
@@ -3983,10 +3991,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -4011,10 +4015,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEERKT_"
   },
   {
@@ -4059,6 +4059,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware6Parcel10BufferInfoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
@@ -4107,6 +4111,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE6assignIPS4_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS4_NS_15iterator_traitsISB_E9referenceEEE5valueEvE4typeESB_SB_"
   },
   {
@@ -4115,11 +4123,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE8__appendEj"
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
+   "name" : "_ZNSt3__16vectorINS_7__stateIcEENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
   },
   {
    "binding" : "weak",
@@ -4179,10 +4191,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEjRKS4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
@@ -4227,7 +4235,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFvRKN7android8hardware8hidl_vecINS2_11hidl_stringEEEEEC2ERKS9_"
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
   },
   {
    "binding" : "weak",
@@ -9973,19 +9981,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::ProcessState>::~sp",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware12ProcessStateEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
    "parameters" :
@@ -20981,23 +20976,6 @@
    ]
   },
   {
-   "function_name" : "android::hardware::details::StatusOf",
-   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIvEE"
-    }
-   ],
-   "return_type" : "_ZTIN7android8hardware6ReturnIbEE",
-   "source_file" : "system/libhidl/base/include/hidl/Status.h",
-   "template_args" :
-   [
-    "_ZTIv",
-    "_ZTIb"
-   ]
-  },
-  {
    "access" : "protected",
    "function_name" : "android::hardware::BHwBinder::onTransact",
    "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
@@ -24427,8 +24405,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -25778,7 +25756,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/33/64/x86/source-based/libldacBT_abr.so.lsdump b/33/64/x86/source-based/libldacBT_abr.so.lsdump
index c83d20d..1f1d90a 100644
--- a/33/64/x86/source-based/libldacBT_abr.so.lsdump
+++ b/33/64/x86/source-based/libldacBT_abr.so.lsdump
@@ -3,6 +3,16 @@
  "builtin_types" :
  [
   {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
@@ -31,6 +41,42 @@
  "elf_functions" :
  [
   {
+   "name" : "ldacBT_alter_eqmid_priority"
+  },
+  {
+   "name" : "ldacBT_close_handle"
+  },
+  {
+   "name" : "ldacBT_encode"
+  },
+  {
+   "name" : "ldacBT_free_handle"
+  },
+  {
+   "name" : "ldacBT_get_bitrate"
+  },
+  {
+   "name" : "ldacBT_get_eqmid"
+  },
+  {
+   "name" : "ldacBT_get_error_code"
+  },
+  {
+   "name" : "ldacBT_get_handle"
+  },
+  {
+   "name" : "ldacBT_get_sampling_freq"
+  },
+  {
+   "name" : "ldacBT_get_version"
+  },
+  {
+   "name" : "ldacBT_init_handle_encode"
+  },
+  {
+   "name" : "ldacBT_set_eqmid"
+  },
+  {
    "name" : "ldac_ABR_Init"
   },
   {
@@ -44,6 +90,90 @@
   },
   {
    "name" : "ldac_ABR_set_thresholds"
+  },
+  {
+   "name" : "ldaclib_check_nlnn_shift"
+  },
+  {
+   "name" : "ldaclib_clear_error_code"
+  },
+  {
+   "name" : "ldaclib_clear_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_encode"
+  },
+  {
+   "name" : "ldaclib_flush_encode"
+  },
+  {
+   "name" : "ldaclib_free_encode"
+  },
+  {
+   "name" : "ldaclib_free_handle"
+  },
+  {
+   "name" : "ldaclib_get_branch_version"
+  },
+  {
+   "name" : "ldaclib_get_channel"
+  },
+  {
+   "name" : "ldaclib_get_channel_config_index"
+  },
+  {
+   "name" : "ldaclib_get_config_info"
+  },
+  {
+   "name" : "ldaclib_get_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_get_encode_setting"
+  },
+  {
+   "name" : "ldaclib_get_error_code"
+  },
+  {
+   "name" : "ldaclib_get_frame_samples"
+  },
+  {
+   "name" : "ldaclib_get_handle"
+  },
+  {
+   "name" : "ldaclib_get_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_get_major_version"
+  },
+  {
+   "name" : "ldaclib_get_minor_version"
+  },
+  {
+   "name" : "ldaclib_get_nlnn"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate_index"
+  },
+  {
+   "name" : "ldaclib_get_version"
+  },
+  {
+   "name" : "ldaclib_init_encode"
+  },
+  {
+   "name" : "ldaclib_set_config_info"
+  },
+  {
+   "name" : "ldaclib_set_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_set_encode_info"
+  },
+  {
+   "name" : "ldaclib_set_frame_header"
   }
  ],
  "elf_objects" : [],
diff --git a/33/64/x86/source-based/libmedia_omx.so.lsdump b/33/64/x86/source-based/libmedia_omx.so.lsdump
index 60600fa..78a2cc3 100644
--- a/33/64/x86/source-based/libmedia_omx.so.lsdump
+++ b/33/64/x86/source-based/libmedia_omx.so.lsdump
@@ -34176,7 +34176,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -34231,13 +34231,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/x86/source-based/libnl.so.lsdump b/33/64/x86/source-based/libnl.so.lsdump
index 5bffea7..16ab44b 100644
--- a/33/64/x86/source-based/libnl.so.lsdump
+++ b/33/64/x86/source-based/libnl.so.lsdump
@@ -4193,7 +4193,7 @@
      "referenced_type" : "_ZTIP7nl_sock"
     },
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4217,7 +4217,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4229,7 +4229,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4277,7 +4277,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
diff --git a/33/64/x86/source-based/libprocessgroup.so.lsdump b/33/64/x86/source-based/libprocessgroup.so.lsdump
index d1a1362..6e13100 100644
--- a/33/64/x86/source-based/libprocessgroup.so.lsdump
+++ b/33/64/x86/source-based/libprocessgroup.so.lsdump
@@ -133,6 +133,12 @@
    "name" : "_Z25setProcessGroupSwappinessjii"
   },
   {
+   "name" : "_Z27removeAllEmptyProcessGroupsv"
+  },
+  {
+   "name" : "_Z30removeAllProcessGroupsInternalb"
+  },
+  {
    "name" : "_Z31DropTaskProfilesResourceCachingv"
   },
   {
diff --git a/33/64/x86/source-based/libssl.so.lsdump b/33/64/x86/source-based/libssl.so.lsdump
index 0502d83..b30c1de 100644
--- a/33/64/x86/source-based/libssl.so.lsdump
+++ b/33/64/x86/source-based/libssl.so.lsdump
@@ -891,6 +891,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8101,6 +8104,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14808,15 +14826,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19320,7 +19329,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24689,20 +24698,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/x86/source-based/libstagefright_foundation.so.lsdump b/33/64/x86/source-based/libstagefright_foundation.so.lsdump
index cdecad4..39843c1 100644
--- a/33/64/x86/source-based/libstagefright_foundation.so.lsdump
+++ b/33/64/x86/source-based/libstagefright_foundation.so.lsdump
@@ -10602,7 +10602,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -23816,7 +23816,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -23858,13 +23858,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/33/64/x86/source-based/libstagefright_omx.so.lsdump b/33/64/x86/source-based/libstagefright_omx.so.lsdump
index 705d02b..875d95b 100644
--- a/33/64/x86/source-based/libstagefright_omx.so.lsdump
+++ b/33/64/x86/source-based/libstagefright_omx.so.lsdump
@@ -20949,7 +20949,7 @@
    "referenced_type" : "_ZTIKN7android7String8E",
    "self_type" : "_ZTIPKN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -22182,7 +22182,7 @@
    "referenced_type" : "_ZTIN7android7String8E",
    "self_type" : "_ZTIPN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -38466,7 +38466,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -38521,13 +38521,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/x86/source-based/libui.so.lsdump b/33/64/x86/source-based/libui.so.lsdump
index 2dc921a..aabd231 100644
--- a/33/64/x86/source-based/libui.so.lsdump
+++ b/33/64/x86/source-based/libui.so.lsdump
@@ -1230,10 +1230,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -2405,10 +2401,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeISC_PvEEEE"
   },
   {
@@ -2425,10 +2417,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -2485,6 +2473,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEE9push_backEOS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -2533,10 +2525,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
@@ -2681,18 +2669,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
   },
   {
@@ -16524,12 +16500,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
diff --git a/33/64/x86/source-based/libunwindstack.so.lsdump b/33/64/x86/source-based/libunwindstack.so.lsdump
index 4a67a83..e4ad0aa 100644
--- a/33/64/x86/source-based/libunwindstack.so.lsdump
+++ b/33/64/x86/source-based/libunwindstack.so.lsdump
@@ -3329,7 +3329,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
-   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:45:1)",
+   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:44:1)",
    "referenced_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "self_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "size" : 1,
diff --git a/33/64/x86/source-based/libutils.so.lsdump b/33/64/x86/source-based/libutils.so.lsdump
index 4def9e1..89d91ce 100644
--- a/33/64/x86/source-based/libutils.so.lsdump
+++ b/33/64/x86/source-based/libutils.so.lsdump
@@ -1225,6 +1225,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
diff --git a/33/64/x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump b/33/64/x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
index 6202adb..5117839 100644
--- a/33/64/x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
+++ b/33/64/x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
@@ -7112,7 +7112,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7128,7 +7128,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7917,7 +7917,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device22BpCameraOfflineSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8552,7 +8552,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8568,7 +8568,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8831,7 +8831,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device28ICameraOfflineSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -9040,7 +9040,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPK7AParcel"
diff --git a/33/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/33/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 20828ac..fdaf8b0 100644
--- a/33/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/33/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -97,7 +97,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTIA16_12_libc_xmmreg",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA23_l",
    "size" : 184,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA24_j",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 8,
@@ -250,7 +250,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -367,7 +367,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTIA8_12_libc_fpxreg",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA8_m",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -554,7 +554,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -866,7 +866,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -948,11 +948,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -969,11 +969,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1078,11 +1078,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3353,7 +3353,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3371,7 +3371,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3392,7 +3392,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3476,7 +3476,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3527,7 +3527,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -5266,7 +5266,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -5284,7 +5284,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -5320,7 +5320,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -5329,7 +5329,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -5338,7 +5338,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -5356,7 +5356,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -5374,7 +5374,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5392,7 +5392,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -5446,7 +5446,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5455,7 +5455,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5464,7 +5464,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5509,7 +5509,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5536,7 +5536,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5563,7 +5563,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -6679,7 +6679,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -8228,7 +8228,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -8268,7 +8268,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9950,7 +9950,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -9990,7 +9990,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -10188,7 +10188,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -10238,7 +10238,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10248,7 +10248,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10258,7 +10258,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10268,7 +10268,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10446,7 +10446,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -10813,7 +10813,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -10843,7 +10843,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10895,7 +10895,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTI12_libc_fpxreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -10911,7 +10911,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTI12_libc_xmmreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -11064,7 +11064,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -11443,7 +11443,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11459,7 +11459,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -11507,7 +11507,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -11549,7 +11549,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -11695,7 +11695,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 216,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -11732,7 +11732,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -11779,7 +11779,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -11845,7 +11845,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -11892,7 +11892,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -12046,7 +12046,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -12152,7 +12152,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 928,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -12173,7 +12173,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -12209,7 +12209,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -12361,7 +12361,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -12544,7 +12544,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 8,
@@ -12560,7 +12560,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -12581,7 +12581,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -12732,7 +12732,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -12753,7 +12753,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -12840,7 +12840,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -12922,7 +12922,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -13061,7 +13061,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 816,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -13077,7 +13077,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -13098,7 +13098,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -13180,7 +13180,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -13201,7 +13201,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -13231,7 +13231,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -13629,12 +13629,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -16408,12 +16408,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -16430,12 +16430,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
diff --git a/33/64/x86_64/source-based/config.ini b/33/64/x86_64/source-based/config.ini
deleted file mode 100644
index a3a2a44..0000000
--- a/33/64/x86_64/source-based/config.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-allow_adding_removing_weak_symbols = true
diff --git a/33/64/x86_64/source-based/libRSCpuRef.so.lsdump b/33/64/x86_64/source-based/libRSCpuRef.so.lsdump
index 5b31584..88f9da9 100644
--- a/33/64/x86_64/source-based/libRSCpuRef.so.lsdump
+++ b/33/64/x86_64/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTIA16_12_libc_xmmreg",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -259,7 +259,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA23_l",
    "size" : 184,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA24_j",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -403,7 +403,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -457,7 +457,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA3_l",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -556,7 +556,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -646,7 +646,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -709,7 +709,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTIA8_12_libc_fpxreg",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -799,7 +799,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA8_m",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -842,7 +842,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -5847,7 +5847,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6568,11 +6568,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6941,11 +6941,11 @@
     }
    ],
    "linker_set_key" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/android/dlext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/android/dlext.h:41:1)",
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7306,11 +7306,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7415,11 +7415,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -10524,7 +10524,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10542,7 +10542,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10581,7 +10581,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -12894,7 +12894,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -12912,7 +12912,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13023,7 +13023,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -15098,7 +15098,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
+   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
    "source_file" : "frameworks/rs/cpu_ref/rsCpuExecutable.h"
   },
   {
@@ -23702,7 +23702,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -23783,7 +23783,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -23864,7 +23864,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -23891,7 +23891,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -23900,7 +23900,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23909,7 +23909,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -23945,7 +23945,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -23963,7 +23963,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23978,8 +23978,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP8timespec",
    "name" : "timespec *",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "external/libcxx/include/__threading_support"
   },
@@ -23990,7 +23990,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -24098,7 +24098,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24107,7 +24107,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24125,7 +24125,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24980,7 +24980,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -24989,7 +24989,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -25043,7 +25043,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -25151,7 +25151,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -25274,8 +25274,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25724,8 +25724,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -28157,7 +28157,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -32108,7 +32108,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -32252,7 +32252,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -32333,7 +32333,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32504,7 +32504,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -32672,7 +32672,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -36345,7 +36345,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 8,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -36388,7 +36388,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -36658,7 +36658,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -36688,7 +36688,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -36896,7 +36896,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36946,7 +36946,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36956,7 +36956,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36966,7 +36966,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36976,7 +36976,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37270,7 +37270,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -37918,7 +37918,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -37948,7 +37948,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -38115,7 +38115,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTI12_libc_fpxreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -38131,7 +38131,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTI12_libc_xmmreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -38358,7 +38358,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38840,7 +38840,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38856,7 +38856,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -39017,7 +39017,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -39177,7 +39177,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -39323,7 +39323,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 216,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -39390,7 +39390,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -39406,7 +39406,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -39611,7 +39611,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -39677,7 +39677,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -39724,7 +39724,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -40190,7 +40190,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -40276,7 +40276,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 144,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -40382,7 +40382,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 928,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -40403,7 +40403,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -40439,7 +40439,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -40591,7 +40591,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -40754,7 +40754,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -40775,7 +40775,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -40994,7 +40994,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 144,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -41025,7 +41025,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 2,
@@ -41155,7 +41155,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -41176,7 +41176,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -41335,7 +41335,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -41434,7 +41434,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 8,
@@ -41452,8 +41452,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 16,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -41516,7 +41516,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 816,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -41532,7 +41532,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -41614,7 +41614,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -41635,7 +41635,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -41665,7 +41665,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -42063,12 +42063,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -48301,7 +48301,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48382,7 +48382,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49157,7 +49157,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -49174,7 +49174,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -49184,7 +49184,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -49201,7 +49201,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -52760,12 +52760,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -52782,12 +52782,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
diff --git a/33/64/x86_64/source-based/libRSDriver.so.lsdump b/33/64/x86_64/source-based/libRSDriver.so.lsdump
index ba3f4fb..610bc25 100644
--- a/33/64/x86_64/source-based/libRSDriver.so.lsdump
+++ b/33/64/x86_64/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -70,7 +70,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTIA16_12_libc_xmmreg",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -97,7 +97,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -214,7 +214,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA23_l",
    "size" : 184,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -232,7 +232,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA24_j",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -421,7 +421,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -565,7 +565,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTIA8_12_libc_fpxreg",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -610,7 +610,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA8_m",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -644,7 +644,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4492,7 +4492,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5225,11 +5225,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5998,11 +5998,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6149,11 +6149,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8212,7 +8212,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8230,7 +8230,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8269,7 +8269,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10012,7 +10012,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10063,7 +10063,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10410,7 +10410,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10434,7 +10434,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11121,7 +11121,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -20989,7 +20989,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21006,7 +21006,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -21029,7 +21029,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21058,7 +21058,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -21072,7 +21072,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21095,7 +21095,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21115,7 +21115,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21129,7 +21129,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21143,7 +21143,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21157,7 +21157,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIPN9RsdShader13StateBasedKeyE",
@@ -21171,7 +21171,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -21200,7 +21200,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21223,7 +21223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21236,7 +21236,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21253,7 +21253,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21267,7 +21267,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPPKc"
@@ -21289,7 +21289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -21308,7 +21308,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -21342,7 +21342,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -21376,7 +21376,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21389,7 +21389,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21402,7 +21402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -23068,7 +23068,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -23149,7 +23149,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -23185,7 +23185,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -23212,7 +23212,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23248,7 +23248,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -23293,7 +23293,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23302,7 +23302,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -23680,7 +23680,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23689,7 +23689,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23707,7 +23707,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24346,7 +24346,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24373,7 +24373,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -25063,8 +25063,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -27811,7 +27811,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -27946,7 +27946,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -28045,7 +28045,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -28227,7 +28227,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -30365,7 +30365,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30565,7 +30565,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30575,7 +30575,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30783,7 +30783,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30793,7 +30793,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30803,7 +30803,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30813,7 +30813,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -30931,7 +30931,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -31139,7 +31139,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -31600,7 +31600,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -31630,7 +31630,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -31797,7 +31797,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTI12_libc_fpxreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -31813,7 +31813,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTI12_libc_xmmreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -32085,7 +32085,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -32638,7 +32638,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -32654,7 +32654,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32856,7 +32856,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32919,7 +32919,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -33096,7 +33096,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 216,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -33218,7 +33218,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -33414,7 +33414,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -33480,7 +33480,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -33615,7 +33615,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -34022,7 +34022,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -34128,7 +34128,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 928,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34180,7 +34180,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -34216,7 +34216,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -34456,7 +34456,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -34477,7 +34477,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -34740,7 +34740,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -34761,7 +34761,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35033,7 +35033,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35132,7 +35132,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 8,
@@ -35150,8 +35150,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
    "size" : 16,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -35214,7 +35214,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 816,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -35398,7 +35398,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35419,7 +35419,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -35501,7 +35501,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -35522,7 +35522,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -35583,7 +35583,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -35981,12 +35981,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "access" : "protected",
@@ -43182,12 +43182,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -43227,12 +43227,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
diff --git a/33/64/x86_64/source-based/libRS_internal.so.lsdump b/33/64/x86_64/source-based/libRS_internal.so.lsdump
index ac2bd23..c7ca8b8 100644
--- a/33/64/x86_64/source-based/libRS_internal.so.lsdump
+++ b/33/64/x86_64/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 2,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -61,7 +61,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA12_i",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA14_i",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTIA16_12_libc_xmmreg",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -151,7 +151,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA16_c",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -250,7 +250,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA23_l",
    "size" : 184,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA24_j",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -430,7 +430,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA3_l",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -511,7 +511,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -538,7 +538,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA4_l",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTIA8_12_libc_fpxreg",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -745,7 +745,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA8_m",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -788,7 +788,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_f",
@@ -6255,7 +6255,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7255,11 +7255,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8492,11 +8492,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8643,11 +8643,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:218:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8778,11 +8778,11 @@
     }
    ],
    "linker_set_key" : "_ZTI8$SHUT_RD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h:59:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h:59:1)",
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11740,7 +11740,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11758,7 +11758,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11797,7 +11797,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13864,7 +13864,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13921,7 +13921,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13990,7 +13990,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -15935,7 +15935,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17004,7 +17004,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -17275,7 +17275,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -17291,7 +17291,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17308,7 +17308,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17325,7 +17325,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIP13ANativeWindow",
@@ -17353,7 +17353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript10AllocationE"
@@ -17369,7 +17369,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -17382,7 +17382,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17404,7 +17404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17426,7 +17426,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17439,7 +17439,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17452,7 +17452,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19960,7 +19960,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21772,7 +21772,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21796,7 +21796,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -22710,7 +22710,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22722,7 +22722,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7IStreamE"
@@ -22754,7 +22754,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22770,7 +22770,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22786,7 +22786,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -22808,7 +22808,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22824,7 +22824,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -23865,7 +23865,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -23959,7 +23959,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -28033,7 +28033,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -28052,7 +28052,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -28077,7 +28077,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -28093,7 +28093,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7OStreamE"
@@ -31940,7 +31940,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35651,7 +35651,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -36035,7 +36035,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -36170,7 +36170,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -36287,7 +36287,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36323,7 +36323,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36341,7 +36341,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -36386,7 +36386,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -36413,7 +36413,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -36431,7 +36431,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -36449,7 +36449,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -36575,7 +36575,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36584,7 +36584,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36602,7 +36602,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37385,7 +37385,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -37412,7 +37412,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37448,7 +37448,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -37601,7 +37601,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37841,8 +37841,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -38084,8 +38084,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38093,8 +38093,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38102,8 +38102,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38111,8 +38111,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -41012,7 +41012,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -41084,7 +41084,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -45278,7 +45278,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -45422,7 +45422,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -45521,7 +45521,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -45642,7 +45642,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45792,7 +45792,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49820,7 +49820,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -49897,7 +49897,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *const",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/memory"
@@ -50180,7 +50180,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -50190,7 +50190,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -50270,7 +50270,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50388,7 +50388,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50438,7 +50438,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50448,7 +50448,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50458,7 +50458,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50468,7 +50468,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50865,7 +50865,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -51319,7 +51319,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "generic",
@@ -51575,7 +51575,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -51605,7 +51605,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -51772,7 +51772,7 @@
    "referenced_type" : "_ZTI12_libc_fpxreg",
    "self_type" : "_ZTI12_libc_fpxreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -51788,7 +51788,7 @@
    "referenced_type" : "_ZTI12_libc_xmmreg",
    "self_type" : "_ZTI12_libc_xmmreg",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52302,7 +52302,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -52741,7 +52741,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "encoding",
@@ -53089,7 +53089,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53105,7 +53105,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -53333,7 +53333,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -53372,7 +53372,7 @@
     {
      "field_name" : "face",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "next",
@@ -53687,7 +53687,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -53702,7 +53702,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -53848,7 +53848,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 216,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -54059,7 +54059,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -54374,7 +54374,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -54440,7 +54440,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -54561,7 +54561,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -55184,7 +55184,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -55291,7 +55291,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 144,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -55397,7 +55397,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 928,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -55449,7 +55449,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -55485,7 +55485,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55637,7 +55637,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -55789,7 +55789,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -55826,7 +55826,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -55847,7 +55847,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55868,7 +55868,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55914,7 +55914,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -56159,7 +56159,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 144,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -56190,7 +56190,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 2,
@@ -56310,7 +56310,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -56346,7 +56346,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -56367,7 +56367,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -56403,7 +56403,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -56645,7 +56645,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -56744,7 +56744,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -56765,7 +56765,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -56826,7 +56826,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 816,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -56914,7 +56914,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -56935,7 +56935,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -57017,7 +57017,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -57038,7 +57038,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -57068,7 +57068,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -57466,12 +57466,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:79:22)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -57738,12 +57738,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h:74:3)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h:74:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -57761,11 +57761,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_Ut_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h:75:5)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h:75:5)",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -70128,12 +70128,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h:309:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -70150,12 +70150,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h:78:20)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -88108,7 +88108,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -92242,7 +92242,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -101722,17 +101722,17 @@
    [
     {
      "field_name" : "__first_",
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__begin_",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_cap_",
@@ -105535,7 +105535,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -105555,7 +105555,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -115363,7 +115363,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -120289,7 +120289,7 @@
    "source_file" : "external/libcxx/include/memory",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -127440,7 +127440,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -131164,7 +131164,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -132986,7 +132986,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -141377,7 +141377,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -141624,7 +141624,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -142287,7 +142287,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -143647,7 +143647,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147719,7 +147719,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -148435,7 +148435,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -149090,7 +149090,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -149337,7 +149337,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -150000,7 +150000,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -150890,7 +150890,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -153665,7 +153665,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -168644,7 +168644,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -198805,7 +198805,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
diff --git a/33/64/x86_64/source-based/libaudioutils.so.lsdump b/33/64/x86_64/source-based/libaudioutils.so.lsdump
index 66d607a..e60e963 100644
--- a/33/64/x86_64/source-based/libaudioutils.so.lsdump
+++ b/33/64/x86_64/source-based/libaudioutils.so.lsdump
@@ -120,6 +120,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIA2_15audio_devices_t",
+   "name" : "audio_devices_t[2]",
+   "referenced_type" : "_ZTI15audio_devices_t",
+   "self_type" : "_ZTIA2_15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIA2_A256_f",
    "name" : "float[2][256]",
    "referenced_type" : "_ZTIA256_f",
@@ -3440,7 +3449,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:335:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:357:1)",
    "referenced_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "self_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "size" : 4,
@@ -3477,7 +3486,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:577:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:599:1)",
    "referenced_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "self_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "size" : 4,
@@ -8837,6 +8846,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIA2_K15audio_devices_t",
+   "name" : "const audio_devices_t[2]",
+   "referenced_type" : "_ZTIA2_15audio_devices_t",
+   "self_type" : "_ZTIA2_K15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIA34_K15audio_devices_t",
    "name" : "const audio_devices_t[34]",
    "referenced_type" : "_ZTIA34_15audio_devices_t",
@@ -8988,7 +9007,7 @@
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIK4$_12",
-   "name" : "const (lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "const (lambda at system/media/audio/include/system/audio.h:1313:41)",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTIK4$_12",
    "size" : 1,
@@ -11069,7 +11088,7 @@
    "alignment" : 1,
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI4$_12",
-   "name" : "(lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "(lambda at system/media/audio/include/system/audio.h:1313:41)",
    "record_kind" : "class",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTI4$_12",
@@ -11131,7 +11150,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN10audio_portUt_E",
-   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:673:5)",
+   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:695:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN10audio_portUt_E",
    "self_type" : "_ZTIN10audio_portUt_E",
@@ -11157,7 +11176,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN13audio_port_v7Ut_E",
-   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:721:5)",
+   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:743:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN13audio_port_v7Ut_E",
    "self_type" : "_ZTIN13audio_port_v7Ut_E",
@@ -11209,7 +11228,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN17audio_port_configUt_E",
-   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:607:5)",
+   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:629:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN17audio_port_configUt_E",
    "self_type" : "_ZTIN17audio_port_configUt_E",
@@ -11231,7 +11250,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN25audio_port_config_mix_extUt_E",
-   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:551:5)",
+   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:573:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN25audio_port_config_mix_extUt_E",
    "self_type" : "_ZTIN25audio_port_config_mix_extUt_E",
diff --git a/33/64/x86_64/source-based/libbinder.so.lsdump b/33/64/x86_64/source-based/libbinder.so.lsdump
index fda7f63..2de34c9 100644
--- a/33/64/x86_64/source-based/libbinder.so.lsdump
+++ b/33/64/x86_64/source-based/libbinder.so.lsdump
@@ -1705,6 +1705,9 @@
    "name" : "_ZN7android18ServiceManagerShim17getConnectionInfoERKNS_8String16E"
   },
   {
+   "name" : "_ZN7android18ServiceManagerShim19getServiceDebugInfoEv"
+  },
+  {
    "name" : "_ZN7android18ServiceManagerShim20getDeclaredInstancesERKNS_8String16E"
   },
   {
@@ -1976,6 +1979,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
   },
   {
@@ -2008,6 +2015,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
   },
   {
@@ -3455,19 +3466,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3475,7 +3486,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_"
+   "name" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3483,11 +3498,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_"
+   "name" : "_ZN7androidlsImEERNS_10TextOutputES2_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsImEERNS_10TextOutputES2_RKT_"
+   "name" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_"
   },
   {
    "name" : "_ZNK7android10MemoryBase9getMemoryEPlPm"
@@ -3756,6 +3771,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android6Parcel11readAlignedImEEiPT_"
   },
   {
@@ -4603,6 +4622,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EmmS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EmmS6_"
   },
   {
@@ -4647,6 +4674,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EmmS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEERNS_9allocatorISA_EEEC2EmmSD_"
   },
   {
@@ -4683,6 +4718,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIlRNS_9allocatorIlEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferImRNS_9allocatorImEEED2Ev"
   },
   {
@@ -5499,10 +5538,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
   },
   {
@@ -5539,6 +5574,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
   },
   {
@@ -5643,6 +5682,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEm"
   },
   {
@@ -5679,6 +5722,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE12__move_rangeEPaS4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EEPa"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEm"
   },
   {
@@ -5791,18 +5846,22 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE12__move_rangeEPiS4_S4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE18__construct_at_endIPiEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_m"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EEPi"
   },
   {
@@ -5835,6 +5894,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE26__swap_out_circular_bufferERNS_14__split_bufferIlRS2_EEPl"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE6assignIPlEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIlNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
   },
   {
@@ -11272,11 +11335,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "referenced_type" : "_ZTIFRN7android10TextOutputES1_E",
-   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "self_type" : "_ZTIFRN7android10TextOutputES1_E",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
@@ -11792,7 +11855,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKNSt3__18functionIFiRKNS_6vectorIhNS_9allocatorIhEEEEbEEE"
@@ -11809,7 +11872,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -11826,7 +11889,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
@@ -11851,7 +11914,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_7IBinderEEE",
@@ -11864,7 +11927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android8BpBinderE"
@@ -11880,7 +11943,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android20RpcCertificateFormatE"
@@ -11896,7 +11959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -11915,7 +11978,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -11931,7 +11994,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11951,7 +12014,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -11967,7 +12030,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__18optionalIjEE",
@@ -11980,7 +12043,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12065,7 +12128,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPm"
@@ -12082,7 +12145,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12096,7 +12159,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12119,7 +12182,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12136,7 +12199,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12155,7 +12218,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIm",
@@ -12168,7 +12231,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIm",
@@ -12182,7 +12245,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12201,7 +12264,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12217,7 +12280,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -12233,7 +12296,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -12249,7 +12312,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12263,7 +12326,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__16threadE"
@@ -12327,7 +12390,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12347,7 +12410,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
@@ -12364,7 +12427,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12387,7 +12450,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12438,7 +12501,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12451,7 +12514,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -12464,7 +12527,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
@@ -12493,7 +12556,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12510,7 +12573,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12526,7 +12589,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12539,7 +12602,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12552,7 +12615,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15171,6 +15234,22 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
    "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
    "parameters" :
@@ -15296,6 +15375,26 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
    "function_name" : "android::sp<android::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
    "parameters" :
@@ -21654,78 +21753,78 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA15_Kc"
+     "referenced_type" : "_ZTIRA2_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA15_c"
+    "_ZTIA2_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA24_Kc"
+     "referenced_type" : "_ZTIRA3_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA24_c"
+    "_ZTIA3_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA34_Kc"
+     "referenced_type" : "_ZTIRA4_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA34_c"
+    "_ZTIA4_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA43_Kc"
+     "referenced_type" : "_ZTIRA5_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA43_c"
+    "_ZTIA5_c"
    ]
   },
   {
@@ -21749,21 +21848,40 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+     "referenced_type" : "_ZTIRA9_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    "_ZTIA9_c"
+   ]
+  },
+  {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+    },
+    {
+     "referenced_type" : "_ZTIRKPc"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIPc"
    ]
   },
   {
@@ -21787,25 +21905,6 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
-    },
-    {
-     "referenced_type" : "_ZTIRKj"
-    }
-   ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
-   "template_args" :
-   [
-    "_ZTIj"
-   ]
-  },
-  {
-   "function_name" : "android::operator<<",
    "linker_set_key" : "_ZN7androidlsImEERNS_10TextOutputES2_RKT_",
    "parameters" :
    [
@@ -21824,6 +21923,25 @@
    ]
   },
   {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE"
+    },
+    {
+     "referenced_type" : "_ZTIRKy"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::MemoryBase::getMemory",
    "linker_set_key" : "_ZNK7android10MemoryBase9getMemoryEPlPm",
    "parameters" :
@@ -24271,7 +24389,7 @@
      "referenced_type" : "_ZTIPKN7android6ParcelE"
     },
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
      "default_arg" : true,
@@ -26241,19 +26359,19 @@
   {
    "linker_set_key" : "_ZN7android4aerrE",
    "name" : "android::aerr",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4alogE",
    "name" : "android::alog",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4aoutE",
    "name" : "android::aout",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
@@ -26744,7 +26862,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -26915,7 +27033,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -29384,8 +29502,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29690,8 +29808,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -34679,8 +34797,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned int>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -34695,8 +34813,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryImEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned long>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryImEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -45771,7 +45889,7 @@
     {
      "access" : "private",
      "field_name" : "mTO",
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android10TextOutput6BundleE",
@@ -49869,6 +49987,27 @@
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "field_name" : "pid",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "name" : "android::IServiceManager::ServiceDebugInfo",
+   "referenced_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "self_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "size" : 32,
+   "source_file" : "frameworks/native/libs/binder/include/binder/IServiceManager.h"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -50041,6 +50180,10 @@
      "mangled_component_name" : "_ZN7android15IServiceManager26unregisterForNotificationsERKNS_8String16ERKNS_2spINS0_25LocalRegistrationCallbackEEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android15IServiceManager19getServiceDebugInfoEv"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
diff --git a/33/64/x86_64/source-based/libcodec2.so.lsdump b/33/64/x86_64/source-based/libcodec2.so.lsdump
index 30e8fda..f86a2e7 100644
--- a/33/64/x86_64/source-based/libcodec2.so.lsdump
+++ b/33/64/x86_64/source-based/libcodec2.so.lsdump
@@ -2383,6 +2383,10 @@
     {
      "enum_field_value" : 16412,
      "name" : "(anonymous namespace)::kParamIndexAndroidChannelMask"
+    },
+    {
+     "enum_field_value" : 16413,
+     "name" : "(anonymous namespace)::kParamIndexTunnelPeekMode"
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_116C2ParamIndexKindE",
@@ -2447,7 +2451,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
-   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:408:1)",
+   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:412:1)",
    "referenced_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "self_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "size" : 4,
@@ -2771,7 +2775,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1584:5)",
+   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1588:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2874,7 +2878,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1810:5)",
+   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1814:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2887,6 +2891,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "C2PlatformConfig::UNSPECIFIED_PEEK"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "C2PlatformConfig::SPECIFIED_PEEK"
+    }
+   ],
+   "linker_set_key" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "name" : "C2PlatformConfig::tunnel_peek_mode_t",
+   "referenced_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "self_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/codec2/core/include/C2Config.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "C2PlatformConfig::NONE"
     },
     {
@@ -2912,7 +2937,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2929,7 +2954,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3040,7 +3065,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1967:5)",
+   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1971:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3057,7 +3082,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1087:5)",
+   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1091:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3074,7 +3099,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1068:5)",
+   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3108,7 +3133,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1434:5)",
+   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1438:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3125,7 +3150,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1557:5)",
+   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1561:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3142,7 +3167,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1941:5)",
+   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1945:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3159,7 +3184,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:753:5)",
+   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:757:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3176,7 +3201,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2321:5)",
+   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2325:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3193,7 +3218,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3210,7 +3235,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3273,7 +3298,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2201:5)",
+   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2205:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3319,7 +3344,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3336,7 +3361,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3353,7 +3378,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3370,7 +3395,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3387,7 +3412,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3404,7 +3429,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3421,7 +3446,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3438,7 +3463,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3476,7 +3501,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1834:5)",
+   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1838:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3493,7 +3518,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2370:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2374:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3535,7 +3560,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1598:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1602:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3552,7 +3577,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2249:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2253:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/33/64/x86_64/source-based/libcrypto.so.lsdump b/33/64/x86_64/source-based/libcrypto.so.lsdump
index 49697a0..2f1eb61 100644
--- a/33/64/x86_64/source-based/libcrypto.so.lsdump
+++ b/33/64/x86_64/source-based/libcrypto.so.lsdump
@@ -3685,12 +3685,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5113,12 +5122,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5194,9 +5197,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5230,15 +5230,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6406,9 +6400,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8235,63 +8226,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9560,30 +9494,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -11161,7 +11071,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -11191,7 +11101,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -14504,111 +14414,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18316,7 +18121,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18583,7 +18388,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18631,7 +18436,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18919,7 +18724,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19289,18 +19094,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25535,39 +25328,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25970,18 +25730,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26132,18 +25880,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26159,21 +25895,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31790,24 +31511,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37333,15 +37036,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37990,15 +37684,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38463,7 +38148,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 8,
@@ -38620,33 +38305,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39223,15 +38881,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39288,7 +38937,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
@@ -39297,26 +38946,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
@@ -39324,8 +38955,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
@@ -39333,8 +38964,35 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
@@ -39709,15 +39367,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40780,7 +40429,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 128,
+   "size" : 112,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40806,16 +40455,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 200,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41272,16 +40911,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 40,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41835,47 +41464,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 32,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/x86_64/source-based/libdmabufheap.so.lsdump b/33/64/x86_64/source-based/libdmabufheap.so.lsdump
index 6ad96d2..7393215 100644
--- a/33/64/x86_64/source-based/libdmabufheap.so.lsdump
+++ b/33/64/x86_64/source-based/libdmabufheap.so.lsdump
@@ -7870,8 +7870,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_64_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_64_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -7974,8 +7974,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_64_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_64_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8173,8 +8173,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_64_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_64_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/33/64/x86_64/source-based/libgralloctypes.so.lsdump b/33/64/x86_64/source-based/libgralloctypes.so.lsdump
index f7decc0..e4e7251 100644
--- a/33/64/x86_64/source-based/libgralloctypes.so.lsdump
+++ b/33/64/x86_64/source-based/libgralloctypes.so.lsdump
@@ -467,14 +467,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8gralloc422encodeOptionalMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNS2_8optionalIT_EEPNS7_8hidl_vecIhEEPFiRKSG_PNS0_13OutputHidlVecEE"
   },
   {
diff --git a/33/64/x86_64/source-based/libhidlbase.so.lsdump b/33/64/x86_64/source-based/libhidlbase.so.lsdump
index 876be9c..009f91d 100644
--- a/33/64/x86_64/source-based/libhidlbase.so.lsdump
+++ b/33/64/x86_64/source-based/libhidlbase.so.lsdump
@@ -422,10 +422,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
   },
   {
@@ -2492,7 +2488,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE8wait_popEv"
+   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE4pushERKS6_"
   },
   {
    "binding" : "weak",
@@ -2595,10 +2591,6 @@
    "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
-  },
-  {
    "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
   },
   {
@@ -3367,10 +3359,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -3399,10 +3387,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__push_lookaheadERKS3_bj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_DUP_COUNTIPKcEET_S7_S7_Ri"
   },
   {
@@ -3423,6 +3407,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_nondupl_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__push_alternationEPNS_16__owns_one_stateIcEES6_"
   },
   {
@@ -3443,10 +3431,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE20__push_word_boundaryEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__parse_basic_reg_expIPKcEET_S7_S7_"
   },
   {
@@ -3459,11 +3443,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_RE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE23__parse_ERE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
   },
   {
    "binding" : "weak",
@@ -3551,6 +3535,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3571,6 +3559,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairImPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3675,14 +3671,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EmmS8_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS4_IS6_EEEC2EmmS8_"
   },
   {
@@ -3983,10 +3971,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEEbEERKT_DpOT0_"
   },
   {
@@ -4063,10 +4047,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEm"
   },
   {
@@ -4127,6 +4107,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7__stateIcEENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
@@ -4231,7 +4219,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFvRKN7android8hardware8hidl_vecINS2_11hidl_stringEEEEEC2ERKS9_"
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
   },
   {
    "binding" : "weak",
@@ -9977,19 +9965,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::ProcessState>::~sp",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware12ProcessStateEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
    "parameters" :
@@ -20985,23 +20960,6 @@
    ]
   },
   {
-   "function_name" : "android::hardware::details::StatusOf",
-   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIvEE"
-    }
-   ],
-   "return_type" : "_ZTIN7android8hardware6ReturnIbEE",
-   "source_file" : "system/libhidl/base/include/hidl/Status.h",
-   "template_args" :
-   [
-    "_ZTIv",
-    "_ZTIb"
-   ]
-  },
-  {
    "access" : "protected",
    "function_name" : "android::hardware::BHwBinder::onTransact",
    "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
@@ -24431,8 +24389,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -25782,7 +25740,7 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/33/64/x86_64/source-based/libldacBT_abr.so.lsdump b/33/64/x86_64/source-based/libldacBT_abr.so.lsdump
index 7bff7ec..d317f6f 100644
--- a/33/64/x86_64/source-based/libldacBT_abr.so.lsdump
+++ b/33/64/x86_64/source-based/libldacBT_abr.so.lsdump
@@ -3,6 +3,16 @@
  "builtin_types" :
  [
   {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
@@ -31,6 +41,42 @@
  "elf_functions" :
  [
   {
+   "name" : "ldacBT_alter_eqmid_priority"
+  },
+  {
+   "name" : "ldacBT_close_handle"
+  },
+  {
+   "name" : "ldacBT_encode"
+  },
+  {
+   "name" : "ldacBT_free_handle"
+  },
+  {
+   "name" : "ldacBT_get_bitrate"
+  },
+  {
+   "name" : "ldacBT_get_eqmid"
+  },
+  {
+   "name" : "ldacBT_get_error_code"
+  },
+  {
+   "name" : "ldacBT_get_handle"
+  },
+  {
+   "name" : "ldacBT_get_sampling_freq"
+  },
+  {
+   "name" : "ldacBT_get_version"
+  },
+  {
+   "name" : "ldacBT_init_handle_encode"
+  },
+  {
+   "name" : "ldacBT_set_eqmid"
+  },
+  {
    "name" : "ldac_ABR_Init"
   },
   {
@@ -44,6 +90,90 @@
   },
   {
    "name" : "ldac_ABR_set_thresholds"
+  },
+  {
+   "name" : "ldaclib_check_nlnn_shift"
+  },
+  {
+   "name" : "ldaclib_clear_error_code"
+  },
+  {
+   "name" : "ldaclib_clear_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_encode"
+  },
+  {
+   "name" : "ldaclib_flush_encode"
+  },
+  {
+   "name" : "ldaclib_free_encode"
+  },
+  {
+   "name" : "ldaclib_free_handle"
+  },
+  {
+   "name" : "ldaclib_get_branch_version"
+  },
+  {
+   "name" : "ldaclib_get_channel"
+  },
+  {
+   "name" : "ldaclib_get_channel_config_index"
+  },
+  {
+   "name" : "ldaclib_get_config_info"
+  },
+  {
+   "name" : "ldaclib_get_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_get_encode_setting"
+  },
+  {
+   "name" : "ldaclib_get_error_code"
+  },
+  {
+   "name" : "ldaclib_get_frame_samples"
+  },
+  {
+   "name" : "ldaclib_get_handle"
+  },
+  {
+   "name" : "ldaclib_get_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_get_major_version"
+  },
+  {
+   "name" : "ldaclib_get_minor_version"
+  },
+  {
+   "name" : "ldaclib_get_nlnn"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate_index"
+  },
+  {
+   "name" : "ldaclib_get_version"
+  },
+  {
+   "name" : "ldaclib_init_encode"
+  },
+  {
+   "name" : "ldaclib_set_config_info"
+  },
+  {
+   "name" : "ldaclib_set_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_set_encode_info"
+  },
+  {
+   "name" : "ldaclib_set_frame_header"
   }
  ],
  "elf_objects" : [],
diff --git a/33/64/x86_64/source-based/libmedia_omx.so.lsdump b/33/64/x86_64/source-based/libmedia_omx.so.lsdump
index 967626b..810cb6f 100644
--- a/33/64/x86_64/source-based/libmedia_omx.so.lsdump
+++ b/33/64/x86_64/source-based/libmedia_omx.so.lsdump
@@ -34195,7 +34195,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -34250,13 +34250,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/x86_64/source-based/libnl.so.lsdump b/33/64/x86_64/source-based/libnl.so.lsdump
index e236232..69d047a 100644
--- a/33/64/x86_64/source-based/libnl.so.lsdump
+++ b/33/64/x86_64/source-based/libnl.so.lsdump
@@ -4184,7 +4184,7 @@
      "referenced_type" : "_ZTIP7nl_sock"
     },
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4208,7 +4208,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4220,7 +4220,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4268,7 +4268,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
diff --git a/33/64/x86_64/source-based/libprocessgroup.so.lsdump b/33/64/x86_64/source-based/libprocessgroup.so.lsdump
index 69acefb..57fa570 100644
--- a/33/64/x86_64/source-based/libprocessgroup.so.lsdump
+++ b/33/64/x86_64/source-based/libprocessgroup.so.lsdump
@@ -133,6 +133,12 @@
    "name" : "_Z25setProcessGroupSwappinessjii"
   },
   {
+   "name" : "_Z27removeAllEmptyProcessGroupsv"
+  },
+  {
+   "name" : "_Z30removeAllProcessGroupsInternalb"
+  },
+  {
    "name" : "_Z31DropTaskProfilesResourceCachingv"
   },
   {
diff --git a/33/64/x86_64/source-based/libssl.so.lsdump b/33/64/x86_64/source-based/libssl.so.lsdump
index 075d7a5..aee6d91 100644
--- a/33/64/x86_64/source-based/libssl.so.lsdump
+++ b/33/64/x86_64/source-based/libssl.so.lsdump
@@ -910,6 +910,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8120,6 +8123,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14827,15 +14845,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -24717,20 +24726,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/x86_64/source-based/libstagefright_foundation.so.lsdump b/33/64/x86_64/source-based/libstagefright_foundation.so.lsdump
index 9ba962e..8ddb82b 100644
--- a/33/64/x86_64/source-based/libstagefright_foundation.so.lsdump
+++ b/33/64/x86_64/source-based/libstagefright_foundation.so.lsdump
@@ -10602,7 +10602,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -23834,7 +23834,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -23876,13 +23876,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/33/64/x86_64/source-based/libstagefright_omx.so.lsdump b/33/64/x86_64/source-based/libstagefright_omx.so.lsdump
index 2007bf3..0050baa 100644
--- a/33/64/x86_64/source-based/libstagefright_omx.so.lsdump
+++ b/33/64/x86_64/source-based/libstagefright_omx.so.lsdump
@@ -210,8 +210,8 @@
   {
    "linker_set_key" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE[]",
-   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -13922,7 +13922,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -13943,7 +13943,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjP20OMX_BUFFERHEADERTYPEE",
@@ -13961,7 +13961,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -13988,7 +13988,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14015,7 +14015,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14147,7 +14147,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjjP20OMX_BUFFERHEADERTYPEE",
@@ -20311,8 +20311,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP16OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20365,8 +20365,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20968,8 +20968,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android15OMXNodeInstanceE",
    "name" : "const android::OMXNodeInstance *",
-   "referenced_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -21466,7 +21466,7 @@
    "referenced_type" : "_ZTIKN7android7String8E",
    "self_type" : "_ZTIPKN7android7String8E",
    "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
@@ -21832,8 +21832,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android15OMXNodeInstanceE",
    "name" : "android::OMXNodeInstance *",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -22708,7 +22708,7 @@
    "referenced_type" : "_ZTIN7android7String8E",
    "self_type" : "_ZTIPN7android7String8E",
    "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
@@ -22876,8 +22876,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx *",
-   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -23056,8 +23056,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -23442,8 +23442,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android15OMXNodeInstanceE",
    "name" : "const android::OMXNodeInstance",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24475,8 +24475,8 @@
    ],
    "linker_set_key" : "_ZTI12OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24676,8 +24676,8 @@
    ],
    "linker_set_key" : "_ZTI16OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 24,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -24939,8 +24939,8 @@
    ],
    "linker_set_key" : "_ZTI17OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 160,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -25373,8 +25373,8 @@
    ],
    "linker_set_key" : "_ZTI20OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 80,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27646,8 +27646,8 @@
    ],
    "linker_set_key" : "_ZTI25OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "self_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27832,8 +27832,8 @@
    ],
    "linker_set_key" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 12,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29155,8 +29155,8 @@
    ],
    "linker_set_key" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 180,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29443,8 +29443,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -29631,8 +29631,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -29871,7 +29871,7 @@
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -29886,8 +29886,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 96,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -30085,8 +30085,8 @@
    ],
    "linker_set_key" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h"
   },
@@ -30443,8 +30443,8 @@
    ],
    "linker_set_key" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32066,8 +32066,8 @@
    ],
    "linker_set_key" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h"
   },
@@ -32168,8 +32168,8 @@
    ],
    "linker_set_key" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -32816,15 +32816,15 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "other",
@@ -32835,8 +32835,8 @@
    "linker_set_key" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE::(unnamed union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5)",
    "record_kind" : "union",
-   "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -33424,13 +33424,13 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE",
    "name" : "android::KeyedVector<OMX_BUFFERHEADERTYPE *, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
     "_ZTIj"
    ]
   },
@@ -33470,13 +33470,13 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE",
    "name" : "android::KeyedVector<android::OMXNodeInstance *, android::wp<android::hidl::base::V1_0::IBase>>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
-    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
     "_ZTIN7android2wpINS_4hidl4base4V1_05IBaseEEE"
    ]
   },
@@ -33562,14 +33562,14 @@
    "linker_set_key" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE",
    "name" : "android::KeyedVector<unsigned int, OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h",
    "template_args" :
    [
     "_ZTIj",
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ]
   },
   {
@@ -34560,13 +34560,13 @@
    "linker_set_key" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE",
    "name" : "android::SortedVector<OMX_BUFFERHEADERTYPE *>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "system/core/libutils/include/utils/SortedVector.h",
    "template_args" :
    [
-    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ],
    "vtable_components" :
    [
@@ -35604,7 +35604,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 576,
-     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35694,13 +35694,13 @@
      "access" : "private",
      "field_name" : "mBufferIDToBufferHeader",
      "field_offset" : 2368,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 2688,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35796,13 +35796,13 @@
      "access" : "private",
      "field_name" : "mInputBuffersWithCodec",
      "field_offset" : 4480,
-     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 4800,
-     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35813,8 +35813,8 @@
    ],
    "linker_set_key" : "_ZTIN7android15OMXNodeInstanceE",
    "name" : "android::OMXNodeInstance",
-   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "vtable_components" :
@@ -40390,7 +40390,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -40445,13 +40445,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
@@ -43182,7 +43182,7 @@
      "access" : "protected",
      "field_name" : "mNode2Observer",
      "field_offset" : 832,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "protected",
@@ -43193,8 +43193,8 @@
    ],
    "linker_set_key" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE",
    "name" : "android::hardware::media::omx::V1_0::implementation::Omx",
-   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "self_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 176,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "vtable_components" :
diff --git a/33/64/x86_64/source-based/libui.so.lsdump b/33/64/x86_64/source-based/libui.so.lsdump
index c280a85..2043f99 100644
--- a/33/64/x86_64/source-based/libui.so.lsdump
+++ b/33/64/x86_64/source-based/libui.so.lsdump
@@ -1230,10 +1230,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -2441,6 +2437,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEEC2EmmS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
   },
   {
@@ -2473,6 +2473,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEE9push_backEOS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -2665,10 +2669,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
@@ -16504,12 +16504,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
diff --git a/33/64/x86_64/source-based/libunwindstack.so.lsdump b/33/64/x86_64/source-based/libunwindstack.so.lsdump
index ed4cb35..8429898 100644
--- a/33/64/x86_64/source-based/libunwindstack.so.lsdump
+++ b/33/64/x86_64/source-based/libunwindstack.so.lsdump
@@ -3324,7 +3324,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
-   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:45:1)",
+   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:44:1)",
    "referenced_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "self_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "size" : 1,
diff --git a/33/64/x86_64/source-based/libutils.so.lsdump b/33/64/x86_64/source-based/libutils.so.lsdump
index d8fbbee..de64300 100644
--- a/33/64/x86_64/source-based/libutils.so.lsdump
+++ b/33/64/x86_64/source-based/libutils.so.lsdump
@@ -1245,6 +1245,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueImEEmRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE17__deallocate_nodeEPNS_16__hash_node_baseIPNS_11__hash_nodeIS5_PvEEEE"
   },
   {
@@ -1253,10 +1257,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS5_PvEEEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE6rehashEm"
   },
   {
diff --git a/33/64/x86_x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump b/33/64/x86_x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
index 542dbb4..3501a46 100644
--- a/33/64/x86_x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
+++ b/33/64/x86_x86_64/source-based/android.hardware.camera.device-V1-ndk.so.lsdump
@@ -7110,7 +7110,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7126,7 +7126,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device21BpCameraDeviceSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -7915,7 +7915,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device22BpCameraOfflineSessionE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8550,7 +8550,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8566,7 +8566,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device27ICameraDeviceSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -8829,7 +8829,7 @@
      "referenced_type" : "_ZTIPN4aidl7android8hardware6camera6device28ICameraOfflineSessionDefaultE"
     },
     {
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     }
    ],
    "return_type" : "_ZTIN3ndk13ScopedAStatusE",
@@ -9038,7 +9038,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.Tiramisu_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
+     "referenced_type" : "_ZTIPN4aidl7android8hardware6common3fmq12MQDescriptorIaNS3_21SynchronizedReadWriteEEE#ODR:out/soong/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk/android_vendor.33_x86_x86_64_static/obj/.intermediates/hardware/interfaces/camera/device/aidl/android.hardware.camera.device-V1-ndk-source/gen/android/hardware/camera/device/ICameraDeviceSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPK7AParcel"
diff --git a/33/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/33/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index eb2f5f0..87163c3 100644
--- a/33/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/33/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA256_c",
    "size" : 256,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -250,7 +250,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -376,7 +376,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -448,7 +448,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -484,7 +484,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -529,7 +529,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -554,7 +554,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -847,7 +847,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -929,11 +929,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -950,11 +950,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1043,11 +1043,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3318,7 +3318,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3336,7 +3336,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3357,7 +3357,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3441,7 +3441,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5168,7 +5168,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -5186,7 +5186,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5222,7 +5222,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5231,7 +5231,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5240,7 +5240,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -5258,7 +5258,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -5294,7 +5294,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5348,7 +5348,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5357,7 +5357,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5366,7 +5366,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5411,7 +5411,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5465,7 +5465,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -6554,7 +6554,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -8067,7 +8067,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -8107,7 +8107,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9729,7 +9729,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9769,7 +9769,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9957,7 +9957,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -10007,7 +10007,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10017,7 +10017,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10027,7 +10027,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10037,7 +10037,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10220,7 +10220,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -10387,7 +10387,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10572,7 +10572,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -10625,7 +10625,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -10655,7 +10655,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10824,7 +10824,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -11198,7 +11198,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11214,7 +11214,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11262,7 +11262,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11304,7 +11304,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11400,7 +11400,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11437,7 +11437,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11484,7 +11484,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -11535,7 +11535,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11582,7 +11582,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11658,7 +11658,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11812,7 +11812,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -11898,7 +11898,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11919,7 +11919,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11955,7 +11955,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -12107,7 +12107,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/locale.h"
   },
   {
    "alignment" : 4,
@@ -12290,7 +12290,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 276,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -12306,7 +12306,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -12327,7 +12327,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -12478,7 +12478,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -12499,7 +12499,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -12586,7 +12586,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 276,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -12668,7 +12668,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -12807,7 +12807,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -12823,7 +12823,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -12844,7 +12844,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -12926,7 +12926,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -12942,7 +12942,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -12972,7 +12972,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -13348,12 +13348,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -16148,12 +16148,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -16171,11 +16171,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -16192,12 +16192,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/x86_x86_64/source-based/config.ini b/33/64/x86_x86_64/source-based/config.ini
deleted file mode 100644
index a3a2a44..0000000
--- a/33/64/x86_x86_64/source-based/config.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-allow_adding_removing_weak_symbols = true
diff --git a/33/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump b/33/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump
index f60a123..7597b13 100644
--- a/33/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -439,7 +439,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -538,7 +538,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -646,7 +646,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -709,7 +709,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -790,7 +790,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -842,7 +842,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -5828,7 +5828,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6549,11 +6549,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6922,11 +6922,11 @@
     }
    ],
    "linker_set_key" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/android/dlext.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/android/dlext.h:41:1)",
    "referenced_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "self_type" : "_ZTI25$ANDROID_DLEXT_FORCE_LOAD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/android/dlext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7287,11 +7287,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7380,11 +7380,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -10468,7 +10468,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10507,7 +10507,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10546,7 +10546,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -12859,7 +12859,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -12877,7 +12877,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -15063,7 +15063,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
+   "return_type" : "_ZTIPN7android12renderscript16ScriptExecutableE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuExecutable.sdump",
    "source_file" : "frameworks/rs/cpu_ref/rsCpuExecutable.h"
   },
   {
@@ -23604,7 +23604,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -23685,7 +23685,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -23766,7 +23766,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -23793,7 +23793,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -23802,7 +23802,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -23811,7 +23811,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -23847,7 +23847,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -23880,8 +23880,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8timespec",
    "name" : "timespec *",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIP8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/__threading_support"
   },
@@ -23892,7 +23892,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -23991,7 +23991,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24009,7 +24009,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24027,7 +24027,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24882,7 +24882,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -24891,7 +24891,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25053,7 +25053,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -25176,8 +25176,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25626,8 +25626,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -28023,7 +28023,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -31947,7 +31947,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -32091,7 +32091,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -32163,7 +32163,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -32334,7 +32334,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -32502,7 +32502,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -36115,7 +36115,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *const",
-   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -36158,7 +36158,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -36428,7 +36428,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -36458,7 +36458,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -36656,7 +36656,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36706,7 +36706,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36716,7 +36716,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36726,7 +36726,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36736,7 +36736,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37035,7 +37035,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -37218,7 +37218,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -37484,7 +37484,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -37721,7 +37721,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -37751,7 +37751,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -38083,7 +38083,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -38560,7 +38560,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38576,7 +38576,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38711,7 +38711,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38871,7 +38871,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -38967,7 +38967,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39034,7 +39034,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 36,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -39050,7 +39050,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -39255,7 +39255,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -39306,7 +39306,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39353,7 +39353,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -39471,7 +39471,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39895,7 +39895,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -39986,7 +39986,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -40072,7 +40072,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -40093,7 +40093,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -40129,7 +40129,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -40281,7 +40281,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/locale.h"
   },
   {
    "alignment" : 4,
@@ -40444,7 +40444,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -40465,7 +40465,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -40689,7 +40689,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -40720,7 +40720,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 2,
@@ -40850,7 +40850,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -40871,7 +40871,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -41030,7 +41030,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -41129,7 +41129,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -41147,8 +41147,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -41211,7 +41211,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -41227,7 +41227,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -41309,7 +41309,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -41325,7 +41325,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -41355,7 +41355,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -41731,12 +41731,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -47980,7 +47980,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48061,7 +48061,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -48836,7 +48836,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48853,7 +48853,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48863,7 +48863,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48880,7 +48880,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -52440,12 +52440,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52463,11 +52463,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52484,12 +52484,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/x86_x86_64/source-based/libRSDriver.so.lsdump b/33/64/x86_x86_64/source-based/libRSDriver.so.lsdump
index d588c02..da46669 100644
--- a/33/64/x86_x86_64/source-based/libRSDriver.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libRSDriver.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -124,7 +124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -151,7 +151,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -304,7 +304,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -331,7 +331,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -457,7 +457,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -511,7 +511,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -556,7 +556,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -592,7 +592,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -671,7 +671,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   }
  ],
  "builtin_types" :
@@ -4668,7 +4668,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5401,11 +5401,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6174,11 +6174,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6309,11 +6309,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8372,7 +8372,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8390,7 +8390,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8429,7 +8429,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10172,7 +10172,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10570,7 +10570,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10594,7 +10594,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11281,7 +11281,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22298,7 +22298,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22315,7 +22315,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22338,7 +22338,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22367,7 +22367,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -22381,7 +22381,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22404,7 +22404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22424,7 +22424,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22438,7 +22438,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22452,7 +22452,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22466,7 +22466,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIPN9RsdShader13StateBasedKeyE",
@@ -22480,7 +22480,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ElementE"
@@ -22509,7 +22509,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22532,7 +22532,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22545,7 +22545,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22562,7 +22562,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22576,7 +22576,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPPKc"
@@ -22598,7 +22598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -22617,7 +22617,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22651,7 +22651,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ProgramE"
@@ -22685,7 +22685,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22698,7 +22698,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22711,7 +22711,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
+     "referenced_type" : "_ZTIP9RsdShader#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdShader.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24350,7 +24350,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -24431,7 +24431,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24467,7 +24467,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24494,7 +24494,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -24530,7 +24530,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -24584,7 +24584,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -25016,7 +25016,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25025,7 +25025,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25043,7 +25043,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25682,7 +25682,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -26453,8 +26453,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -29210,7 +29210,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -29345,7 +29345,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -29444,7 +29444,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -29644,7 +29644,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -31832,7 +31832,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32032,7 +32032,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32042,7 +32042,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32270,7 +32270,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32280,7 +32280,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32290,7 +32290,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32300,7 +32300,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -32418,7 +32418,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -32631,7 +32631,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -32846,7 +32846,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -33031,7 +33031,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -33100,7 +33100,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -33130,7 +33130,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -33533,7 +33533,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -34066,7 +34066,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34082,7 +34082,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34269,7 +34269,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34332,7 +34332,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34444,7 +34444,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34566,7 +34566,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34732,7 +34732,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -34783,7 +34783,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34918,7 +34918,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -35010,7 +35010,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35386,7 +35386,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -35472,7 +35472,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35524,7 +35524,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35560,7 +35560,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -35800,7 +35800,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -35821,7 +35821,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -36084,7 +36084,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -36105,7 +36105,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -36332,7 +36332,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36431,7 +36431,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -36449,8 +36449,8 @@
    ],
    "linker_set_key" : "_ZTI8timespec",
    "name" : "timespec",
-   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
-   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "referenced_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
+   "self_type" : "_ZTI8timespec#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/driver/rsdGL.sdump",
    "size" : 8,
    "source_file" : "bionic/libc/kernel/uapi/linux/time.h"
   },
@@ -36513,7 +36513,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36697,7 +36697,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -36718,7 +36718,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -36800,7 +36800,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -36816,7 +36816,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -36862,7 +36862,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -37238,12 +37238,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "access" : "protected",
@@ -44451,12 +44451,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -44474,11 +44474,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -44518,12 +44518,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
diff --git a/33/64/x86_x86_64/source-based/libRS_internal.so.lsdump b/33/64/x86_x86_64/source-based/libRS_internal.so.lsdump
index 4d8b453..7d3b24d 100644
--- a/33/64/x86_x86_64/source-based/libRS_internal.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libRS_internal.so.lsdump
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA10_i",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 1,
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA126_c",
    "size" : 126,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -106,7 +106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA14_c",
    "size" : 14,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA19_i",
    "size" : 76,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA1_i",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA1_m",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA20_l",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -358,7 +358,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA2_m",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -385,7 +385,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA32_c",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -412,7 +412,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA32_l",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -520,7 +520,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA4_h",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -574,7 +574,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIA56_l",
    "size" : 224,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 2,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIA65_PKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTIA8_11_libc_fpreg",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 2,
@@ -736,7 +736,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA8_i",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -788,7 +788,7 @@
    "name" : "char *[]",
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIA_Pc",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "linker_set_key" : "_ZTIA_f",
@@ -6236,7 +6236,7 @@
    "referenced_type" : "_ZTI16HeapTaggingLevel",
    "self_type" : "_ZTI16HeapTaggingLevel",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7236,11 +7236,11 @@
     }
    ],
    "linker_set_key" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:41:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:41:1)",
    "referenced_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "self_type" : "_ZTI22$PTHREAD_MUTEX_DEFAULT",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8473,11 +8473,11 @@
     }
    ],
    "linker_set_key" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h:63:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h:63:1)",
    "referenced_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "self_type" : "_ZTI32$PTHREAD_RWLOCK_PREFER_READER_NP",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8608,11 +8608,11 @@
     }
    ],
    "linker_set_key" : "_ZTI6$NGREG",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:128:1)",
    "referenced_type" : "_ZTI6$NGREG",
    "self_type" : "_ZTI6$NGREG",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8743,11 +8743,11 @@
     }
    ],
    "linker_set_key" : "_ZTI8$SHUT_RD",
-   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h:59:1)",
+   "name" : "(unnamed enum at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h:59:1)",
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11705,7 +11705,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11723,7 +11723,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11762,7 +11762,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13829,7 +13829,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13886,7 +13886,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -15900,7 +15900,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -16969,7 +16969,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPPv"
@@ -17240,7 +17240,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -17256,7 +17256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17273,7 +17273,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "default_arg" : true,
@@ -17290,7 +17290,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIP13ANativeWindow",
@@ -17318,7 +17318,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript10AllocationE"
@@ -17334,7 +17334,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -17347,7 +17347,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17369,7 +17369,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
@@ -17391,7 +17391,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17404,7 +17404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -17417,7 +17417,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript15GrallocConsumerE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsGrallocConsumer.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -19925,7 +19925,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21737,7 +21737,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -21761,7 +21761,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump"
     },
     {
      "referenced_type" : "_ZTIPf"
@@ -22675,7 +22675,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22687,7 +22687,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7IStreamE"
@@ -22719,7 +22719,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22735,7 +22735,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22751,7 +22751,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -22773,7 +22773,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -22789,7 +22789,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -23830,7 +23830,7 @@
      "referenced_type" : "_ZTIPN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -23924,7 +23924,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript6DeviceE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump"
     },
     {
      "referenced_type" : "_ZTIPK15RsSurfaceConfig"
@@ -27998,7 +27998,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -28017,7 +28017,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -28042,7 +28042,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -28058,7 +28058,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript4MeshE"
     },
     {
-     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript7ContextE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIPN7android12renderscript7OStreamE"
@@ -31905,7 +31905,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> &",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35571,7 +35571,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35937,7 +35937,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -36072,7 +36072,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTIP13_libc_fpstate",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36189,7 +36189,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTIP16user_regs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36225,7 +36225,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTIP18user_fpregs_struct",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36243,7 +36243,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTIP19__pthread_cleanup_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36288,7 +36288,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -36315,7 +36315,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -36351,7 +36351,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36477,7 +36477,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36486,7 +36486,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36504,7 +36504,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37287,7 +37287,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37314,7 +37314,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37503,7 +37503,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -37743,8 +37743,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "const android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *",
-   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37986,8 +37986,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37995,8 +37995,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38004,8 +38004,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38013,8 +38013,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40878,7 +40878,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -40950,7 +40950,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -45126,7 +45126,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -45270,7 +45270,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -45360,7 +45360,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -45481,7 +45481,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45631,7 +45631,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49609,7 +49609,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49686,7 +49686,7 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *const",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIKPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/memory"
@@ -49969,7 +49969,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49979,7 +49979,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -50059,7 +50059,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -50167,7 +50167,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50217,7 +50217,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50227,7 +50227,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50237,7 +50237,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50247,7 +50247,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50649,7 +50649,7 @@
    "referenced_type" : "_ZTI10mcontext_t",
    "self_type" : "_ZTI10mcontext_t",
    "size" : 88,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -50832,7 +50832,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51120,7 +51120,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "generic",
@@ -51328,7 +51328,7 @@
    "referenced_type" : "_ZTI11_libc_fpreg",
    "self_type" : "_ZTI11_libc_fpreg",
    "size" : 10,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -51397,7 +51397,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -51427,7 +51427,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -52072,7 +52072,7 @@
    "referenced_type" : "_ZTI13_libc_fpstate",
    "self_type" : "_ZTI13_libc_fpstate",
    "size" : 112,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -52511,7 +52511,7 @@
    [
     {
      "field_name" : "face",
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "encoding",
@@ -52854,7 +52854,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52870,7 +52870,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53098,7 +53098,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53137,7 +53137,7 @@
     {
      "field_name" : "face",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
+     "referenced_type" : "_ZTIP11FT_FaceRec_#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsFont.sdump"
     },
     {
      "field_name" : "next",
@@ -53452,7 +53452,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53467,7 +53467,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -53563,7 +53563,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 68,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -53774,7 +53774,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -54089,7 +54089,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -54140,7 +54140,7 @@
    "referenced_type" : "_ZTI18user_fpregs_struct",
    "self_type" : "_ZTI18user_fpregs_struct",
    "size" : 108,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54261,7 +54261,7 @@
    "referenced_type" : "_ZTI19__pthread_cleanup_t",
    "self_type" : "_ZTI19__pthread_cleanup_t",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -54363,7 +54363,7 @@
    "referenced_type" : "_ZTI19user_fpxregs_struct",
    "self_type" : "_ZTI19user_fpxregs_struct",
    "size" : 512,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54960,7 +54960,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -55072,7 +55072,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -55158,7 +55158,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 284,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -55210,7 +55210,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55246,7 +55246,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -55398,7 +55398,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/locale.h"
   },
   {
    "alignment" : 4,
@@ -55550,7 +55550,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -55587,7 +55587,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -55608,7 +55608,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55629,7 +55629,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55675,7 +55675,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 28,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55925,7 +55925,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -55956,7 +55956,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 2,
@@ -56076,7 +56076,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -56112,7 +56112,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -56133,7 +56133,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -56169,7 +56169,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -56411,7 +56411,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -56510,7 +56510,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -56531,7 +56531,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -56592,7 +56592,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 228,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -56680,7 +56680,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -56701,7 +56701,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -56783,7 +56783,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -56799,7 +56799,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -56829,7 +56829,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -57205,12 +57205,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN11sigaction64Ut_E",
-   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
+   "name" : "sigaction64::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:100:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -57477,12 +57477,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h:74:3)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h:74:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -57500,11 +57500,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN16sockaddr_storageUt_Ut_E",
-   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h:75:5)",
+   "name" : "sockaddr_storage::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h:74:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h:75:5)",
    "referenced_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_Ut_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -69879,12 +69879,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -69902,11 +69902,11 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN8ucontextUt_Ut_E",
-   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
+   "name" : "ucontext::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:205:3)::(anonymous struct at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h:206:5)",
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -69923,12 +69923,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN9sigactionUt_E",
-   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
+   "name" : "sigaction::(anonymous union at out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h:89:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.Tiramisu_x86_x86_64_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.33_x86_x86_64_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -87475,7 +87475,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -91506,7 +91506,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -100800,17 +100800,17 @@
    [
     {
      "field_name" : "__first_",
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__begin_",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+     "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
     },
     {
      "field_name" : "__end_cap_",
@@ -104526,7 +104526,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -104546,7 +104546,7 @@
    "template_args" :
    [
     "_ZTINSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE",
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -114149,7 +114149,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -118953,7 +118953,7 @@
    "source_file" : "external/libcxx/include/memory",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -125967,7 +125967,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -129653,7 +129653,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -131418,7 +131418,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139598,7 +139598,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139832,7 +139832,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140482,7 +140482,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -141829,7 +141829,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -145876,7 +145876,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146516,7 +146516,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147152,7 +147152,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147386,7 +147386,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -148036,7 +148036,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -148913,7 +148913,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -151649,7 +151649,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -166186,7 +166186,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+    "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
     "_ZTIRNSt3__19allocatorIN7android12renderscript13ObjectBaseRefINS2_14ScriptKernelIDEEEEE"
    ]
   },
@@ -195790,7 +195790,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "name" : "android::renderscript::ObjectBaseRef<android::renderscript::ScriptKernelID> *&&",
-   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.33_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIOPN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
diff --git a/33/64/x86_x86_64/source-based/libaudioutils.so.lsdump b/33/64/x86_x86_64/source-based/libaudioutils.so.lsdump
index 370cca5..263143f 100644
--- a/33/64/x86_x86_64/source-based/libaudioutils.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libaudioutils.so.lsdump
@@ -120,6 +120,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIA2_15audio_devices_t",
+   "name" : "audio_devices_t[2]",
+   "referenced_type" : "_ZTI15audio_devices_t",
+   "self_type" : "_ZTIA2_15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIA2_A256_f",
    "name" : "float[2][256]",
    "referenced_type" : "_ZTIA256_f",
@@ -3424,7 +3433,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:335:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:357:1)",
    "referenced_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "self_type" : "_ZTI22$AUDIO_INTERLEAVE_LEFT",
    "size" : 4,
@@ -3461,7 +3470,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
-   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:577:1)",
+   "name" : "(unnamed enum at system/media/audio/include/system/audio.h:599:1)",
    "referenced_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "self_type" : "_ZTI22$AUDIO_PORT_CONFIG_ALL",
    "size" : 4,
@@ -8803,6 +8812,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIA2_K15audio_devices_t",
+   "name" : "const audio_devices_t[2]",
+   "referenced_type" : "_ZTIA2_15audio_devices_t",
+   "self_type" : "_ZTIA2_K15audio_devices_t",
+   "size" : 8,
+   "source_file" : "system/media/audio/include/system/audio-base-utils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIA34_K15audio_devices_t",
    "name" : "const audio_devices_t[34]",
    "referenced_type" : "_ZTIA34_15audio_devices_t",
@@ -8954,7 +8973,7 @@
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIK4$_12",
-   "name" : "const (lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "const (lambda at system/media/audio/include/system/audio.h:1313:41)",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTIK4$_12",
    "size" : 1,
@@ -11025,7 +11044,7 @@
    "alignment" : 1,
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI4$_12",
-   "name" : "(lambda at system/media/audio/include/system/audio.h:1291:41)",
+   "name" : "(lambda at system/media/audio/include/system/audio.h:1313:41)",
    "record_kind" : "class",
    "referenced_type" : "_ZTI4$_12",
    "self_type" : "_ZTI4$_12",
@@ -11087,7 +11106,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN10audio_portUt_E",
-   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:673:5)",
+   "name" : "audio_port::(unnamed union at system/media/audio/include/system/audio.h:695:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN10audio_portUt_E",
    "self_type" : "_ZTIN10audio_portUt_E",
@@ -11113,7 +11132,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN13audio_port_v7Ut_E",
-   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:721:5)",
+   "name" : "audio_port_v7::(unnamed union at system/media/audio/include/system/audio.h:743:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN13audio_port_v7Ut_E",
    "self_type" : "_ZTIN13audio_port_v7Ut_E",
@@ -11165,7 +11184,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN17audio_port_configUt_E",
-   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:607:5)",
+   "name" : "audio_port_config::(unnamed union at system/media/audio/include/system/audio.h:629:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN17audio_port_configUt_E",
    "self_type" : "_ZTIN17audio_port_configUt_E",
@@ -11187,7 +11206,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN25audio_port_config_mix_extUt_E",
-   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:551:5)",
+   "name" : "audio_port_config_mix_ext::(unnamed union at system/media/audio/include/system/audio.h:573:5)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN25audio_port_config_mix_extUt_E",
    "self_type" : "_ZTIN25audio_port_config_mix_extUt_E",
diff --git a/33/64/x86_x86_64/source-based/libbinder.so.lsdump b/33/64/x86_x86_64/source-based/libbinder.so.lsdump
index 9ac58f4..c79d060 100644
--- a/33/64/x86_x86_64/source-based/libbinder.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libbinder.so.lsdump
@@ -1686,6 +1686,9 @@
    "name" : "_ZN7android18ServiceManagerShim17getConnectionInfoERKNS_8String16E"
   },
   {
+   "name" : "_ZN7android18ServiceManagerShim19getServiceDebugInfoEv"
+  },
+  {
    "name" : "_ZN7android18ServiceManagerShim20getDeclaredInstancesERKNS_8String16E"
   },
   {
@@ -1957,6 +1960,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
   },
   {
@@ -1989,6 +1996,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
   },
   {
@@ -2113,10 +2124,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
   },
   {
@@ -2129,6 +2136,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
   },
   {
@@ -3440,19 +3451,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_"
+   "name" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3460,7 +3471,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_"
+   "name" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_"
   },
   {
    "binding" : "weak",
@@ -3471,6 +3486,10 @@
    "name" : "_ZN7androidlsIjEERNS_10TextOutputES2_RKT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_"
+  },
+  {
    "name" : "_ZNK7android10MemoryBase9getMemoryEPiPj"
   },
   {
@@ -3737,6 +3756,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
   },
   {
@@ -4588,6 +4611,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android15IServiceManager16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEEC2EjjS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2os16ServiceDebugInfoERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_10RpcSession13RpcConnectionEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -4640,6 +4679,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEEC2EjjSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIdRNS_9allocatorIdEEED2Ev"
   },
   {
@@ -4652,6 +4699,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIxRNS_9allocatorIxEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__thread_proxyINS_5tupleIJNS_10unique_ptrINS_15__thread_structENS_14default_deleteIS3_EEEEPFvON7android2spINS7_9RpcServerEEEESA_EEEEEPvSF_"
   },
   {
@@ -4760,10 +4811,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
   },
   {
@@ -5448,6 +5495,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
   },
   {
@@ -5524,10 +5575,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -5564,6 +5611,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
   },
   {
@@ -5692,6 +5747,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
   },
   {
@@ -5700,6 +5759,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE12__move_rangeEPaS4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EEPa"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
   },
   {
@@ -5764,6 +5835,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE18__construct_at_endIPdEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EEPd"
   },
   {
@@ -5824,18 +5899,22 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE12__move_rangeEPiS4_S4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE18__construct_at_endIPiEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES7_S7_j"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EEPi"
   },
   {
@@ -5856,10 +5935,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE12__move_rangeEPxS4_S4_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EEPx"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
   },
   {
@@ -11259,11 +11346,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "referenced_type" : "_ZTIFRN7android10TextOutputES1_E",
-   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "self_type" : "_ZTIFRN7android10TextOutputES1_E",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
@@ -11779,7 +11866,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKNSt3__18functionIFiRKNS_6vectorIhNS_9allocatorIhEEEEbEEE"
@@ -11796,7 +11883,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -11813,7 +11900,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
@@ -11838,7 +11925,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_7IBinderEEE",
@@ -11851,7 +11938,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKN7android8BpBinderE"
@@ -11867,7 +11954,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android20RpcCertificateFormatE"
@@ -11883,7 +11970,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -11902,7 +11989,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
@@ -11918,7 +12005,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -11938,7 +12025,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -11954,7 +12041,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__18optionalIjEE",
@@ -11967,7 +12054,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12052,7 +12139,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPj"
@@ -12069,7 +12156,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12083,7 +12170,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12106,7 +12193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12123,7 +12210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12142,7 +12229,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12155,7 +12242,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIj",
@@ -12169,7 +12256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIy"
@@ -12188,7 +12275,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12204,7 +12291,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -12220,7 +12307,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -12236,7 +12323,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12250,7 +12337,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__16threadE"
@@ -12314,7 +12401,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
@@ -12334,7 +12421,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
@@ -12351,7 +12438,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android16RpcSocketAddressE"
@@ -12374,7 +12461,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android12RpcTransportENS_14default_deleteIS2_EEEE"
@@ -12425,7 +12512,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -12438,7 +12525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -12451,7 +12538,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
@@ -12480,7 +12567,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12497,7 +12584,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     },
     {
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android15RpcTransportCtxENS_14default_deleteIS2_EEEE"
@@ -12513,7 +12600,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12526,7 +12613,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -12539,7 +12626,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
+     "referenced_type" : "_ZTIPN7android10RpcSessionE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/RpcSession.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -15158,6 +15245,22 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
    "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
    "parameters" :
@@ -15283,6 +15386,26 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
    "function_name" : "android::sp<android::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
    "parameters" :
@@ -15784,26 +15907,6 @@
   },
   {
    "function_name" : "android::sp<android::IMemory>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" :
-   [
-    "_ZTIN7android10AllocationE"
-   ]
-  },
-  {
-   "function_name" : "android::sp<android::IMemory>::operator=",
    "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
    "parameters" :
    [
@@ -15849,6 +15952,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
    "parameters" :
@@ -21667,78 +21786,78 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA15_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA2_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA15_Kc"
+     "referenced_type" : "_ZTIRA2_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA15_c"
+    "_ZTIA2_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA24_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA3_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRA24_Kc"
+     "referenced_type" : "_ZTIRA3_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA24_c"
+    "_ZTIA3_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA34_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA4_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA34_Kc"
+     "referenced_type" : "_ZTIRA4_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA34_c"
+    "_ZTIA4_c"
    ]
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsIA43_cEERNS_10TextOutputES3_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA5_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
-     "referenced_type" : "_ZTIRA43_Kc"
+     "referenced_type" : "_ZTIRA5_Kc"
     }
    ],
-   "return_type" : "_ZTIRN7android10TextOutputE",
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTIA43_c"
+    "_ZTIA5_c"
    ]
   },
   {
@@ -21762,21 +21881,40 @@
   },
   {
    "function_name" : "android::operator<<",
-   "linker_set_key" : "_ZN7androidlsINSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEERNS_10TextOutputES9_RKT_",
+   "linker_set_key" : "_ZN7androidlsIA9_cEERNS_10TextOutputES3_RKT_",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIRN7android10TextOutputE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+     "referenced_type" : "_ZTIRA9_Kc"
     }
    ],
    "return_type" : "_ZTIRN7android10TextOutputE",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
    "template_args" :
    [
-    "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    "_ZTIA9_c"
+   ]
+  },
+  {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIPcEERNS_10TextOutputES3_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+    },
+    {
+     "referenced_type" : "_ZTIRKPc"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIPc"
    ]
   },
   {
@@ -21818,6 +21956,25 @@
    ]
   },
   {
+   "function_name" : "android::operator<<",
+   "linker_set_key" : "_ZN7androidlsIyEERNS_10TextOutputES2_RKT_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRN7android10TextOutputE"
+    },
+    {
+     "referenced_type" : "_ZTIRKy"
+    }
+   ],
+   "return_type" : "_ZTIRN7android10TextOutputE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::MemoryBase::getMemory",
    "linker_set_key" : "_ZNK7android10MemoryBase9getMemoryEPiPj",
    "parameters" :
@@ -24265,7 +24422,7 @@
      "referenced_type" : "_ZTIPKN7android6ParcelE"
     },
     {
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/Parcel.sdump"
     },
     {
      "default_arg" : true,
@@ -26235,19 +26392,19 @@
   {
    "linker_set_key" : "_ZN7android4aerrE",
    "name" : "android::aerr",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4alogE",
    "name" : "android::alog",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
    "linker_set_key" : "_ZN7android4aoutE",
    "name" : "android::aout",
-   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
+   "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump",
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
@@ -26738,7 +26895,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -26909,7 +27066,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> &",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -29342,8 +29499,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::basic_format_arg<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29630,8 +29787,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "const fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>> *",
-   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIPKN3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -34565,8 +34722,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned int>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIjEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -34581,8 +34738,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE",
    "name" : "const fmt::detail::divtest_table_entry<unsigned long long>[]",
-   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.Tiramisu_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIA_N3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "self_type" : "_ZTIA_KN3fmt2v76detail19divtest_table_entryIyEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.33_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "source_file" : "external/fmtlib/include/fmt/format.h"
   },
   {
@@ -45207,7 +45364,7 @@
     {
      "access" : "private",
      "field_name" : "mTO",
-     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
+     "referenced_type" : "_ZTIRN7android10TextOutputE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.33_x86_x86_64_shared/obj/frameworks/native/libs/binder/BufferedTextOutput.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android10TextOutput6BundleE",
@@ -49305,6 +49462,27 @@
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "name",
+     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+    },
+    {
+     "field_name" : "pid",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "name" : "android::IServiceManager::ServiceDebugInfo",
+   "referenced_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "self_type" : "_ZTIN7android15IServiceManager16ServiceDebugInfoE",
+   "size" : 16,
+   "source_file" : "frameworks/native/libs/binder/include/binder/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -49477,6 +49655,10 @@
      "mangled_component_name" : "_ZN7android15IServiceManager26unregisterForNotificationsERKNS_8String16ERKNS_2spINS0_25LocalRegistrationCallbackEEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android15IServiceManager19getServiceDebugInfoEv"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
diff --git a/33/64/x86_x86_64/source-based/libcodec2.so.lsdump b/33/64/x86_x86_64/source-based/libcodec2.so.lsdump
index ca745df..a076cfb 100644
--- a/33/64/x86_x86_64/source-based/libcodec2.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libcodec2.so.lsdump
@@ -2383,6 +2383,10 @@
     {
      "enum_field_value" : 16412,
      "name" : "(anonymous namespace)::kParamIndexAndroidChannelMask"
+    },
+    {
+     "enum_field_value" : 16413,
+     "name" : "(anonymous namespace)::kParamIndexTunnelPeekMode"
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_116C2ParamIndexKindE",
@@ -2447,7 +2451,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
-   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:408:1)",
+   "name" : "(anonymous namespace)::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:412:1)",
    "referenced_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "self_type" : "_ZTIN12_GLOBAL__N_130$C2_PROFILE_LEVEL_VENDOR_STARTE",
    "size" : 4,
@@ -2771,7 +2775,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1584:5)",
+   "name" : "C2ColorXyStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1588:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2874,7 +2878,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1810:5)",
+   "name" : "C2GopLayerStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1814:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2887,6 +2891,27 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "C2PlatformConfig::UNSPECIFIED_PEEK"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "C2PlatformConfig::SPECIFIED_PEEK"
+    }
+   ],
+   "linker_set_key" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "name" : "C2PlatformConfig::tunnel_peek_mode_t",
+   "referenced_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "self_type" : "_ZTIN16C2PlatformConfig18tunnel_peek_mode_tE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/codec2/core/include/C2Config.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "C2PlatformConfig::NONE"
     },
     {
@@ -2912,7 +2937,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2929,7 +2954,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1465:5)",
+   "name" : "C2ColorInfoStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1469:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3040,7 +3065,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1967:5)",
+   "name" : "C2TileLayoutStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1971:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3057,7 +3082,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1087:5)",
+   "name" : "C2OutOfMemoryStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1091:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3074,7 +3099,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1068:5)",
+   "name" : "C2PictureSizeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3108,7 +3133,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1434:5)",
+   "name" : "C2ChromaOffsetStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1438:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3125,7 +3150,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1557:5)",
+   "name" : "C2ColorAspectsStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1561:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3142,7 +3167,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1941:5)",
+   "name" : "C2IntraRefreshStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1945:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3159,7 +3184,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:753:5)",
+   "name" : "C2ProfileLevelStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:757:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3176,7 +3201,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2321:5)",
+   "name" : "C2TimedControlStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2325:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3193,7 +3218,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3210,7 +3235,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2417:5)",
+   "name" : "C2TunneledModeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2421:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3273,7 +3298,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2201:5)",
+   "name" : "C2StoreIonUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2205:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3319,7 +3344,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3336,7 +3361,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2229:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2233:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3353,7 +3378,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3370,7 +3395,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:809:5)",
+   "name" : "C2SupplementalDataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:813:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3387,7 +3412,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3404,7 +3429,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1912:5)",
+   "name" : "C2TemporalLayeringStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1916:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3421,7 +3446,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3438,7 +3463,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
-   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1657:5)",
+   "name" : "C2HdrDynamicMetadataStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1661:5)",
    "referenced_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN26C2HdrDynamicMetadataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3476,7 +3501,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1834:5)",
+   "name" : "C2PictureQuantizationStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1838:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3493,7 +3518,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2370:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2374:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3535,7 +3560,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1598:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:1602:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3552,7 +3577,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2249:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(unnamed enum at frameworks/av/media/codec2/core/include/C2Config.h:2253:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/33/64/x86_x86_64/source-based/libcrypto.so.lsdump b/33/64/x86_x86_64/source-based/libcrypto.so.lsdump
index 51c7642..c9757d2 100644
--- a/33/64/x86_x86_64/source-based/libcrypto.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libcrypto.so.lsdump
@@ -3657,12 +3657,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5085,12 +5094,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5166,9 +5169,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5202,15 +5202,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6378,9 +6372,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8207,63 +8198,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9532,30 +9466,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -11133,7 +11043,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -11163,7 +11073,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
+     "referenced_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
      "referenced_type" : "_ZTIP13X509_algor_st"
@@ -14476,111 +14386,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18288,7 +18093,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18555,7 +18360,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18603,7 +18408,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18891,7 +18696,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19261,18 +19066,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25507,39 +25300,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25942,18 +25702,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26104,18 +25852,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26131,21 +25867,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31762,24 +31483,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37305,15 +37008,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37953,15 +37647,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38426,7 +38111,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38583,33 +38268,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39186,15 +38844,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39251,7 +38900,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
@@ -39260,26 +38909,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
@@ -39287,8 +38918,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
@@ -39296,8 +38927,35 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.Tiramisu_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_info.sdump",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
@@ -39672,15 +39330,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40761,7 +40410,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40787,16 +40436,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41253,16 +40892,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41816,47 +41445,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/x86_x86_64/source-based/libdmabufheap.so.lsdump b/33/64/x86_x86_64/source-based/libdmabufheap.so.lsdump
index 0ffd290..6f24c5b 100644
--- a/33/64/x86_x86_64/source-based/libdmabufheap.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libdmabufheap.so.lsdump
@@ -7706,8 +7706,8 @@
    ],
    "linker_set_key" : "_ZTI13ion_heap_data",
    "name" : "ion_heap_data",
-   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI13ion_heap_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
    "size" : 52,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -7810,8 +7810,8 @@
    ],
    "linker_set_key" : "_ZTI14ion_heap_query",
    "name" : "ion_heap_query",
-   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI14ion_heap_query#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
@@ -8009,8 +8009,8 @@
    ],
    "linker_set_key" : "_ZTI23ion_new_allocation_data",
    "name" : "ion_new_allocation_data",
-   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
-   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.Tiramisu_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "referenced_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
+   "self_type" : "_ZTI23ion_new_allocation_data#ODR:out/soong/.intermediates/system/memory/libion/libion/android_vendor.33_x86_x86_64_static/obj/system/memory/libion/ion.sdump",
    "size" : 24,
    "source_file" : "system/memory/libion/kernel-headers/linux/ion_4.19.h"
   },
diff --git a/33/64/x86_x86_64/source-based/libgralloctypes.so.lsdump b/33/64/x86_x86_64/source-based/libgralloctypes.so.lsdump
index 308d38a..5ae782f 100644
--- a/33/64/x86_x86_64/source-based/libgralloctypes.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libgralloctypes.so.lsdump
@@ -324,6 +324,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS8_8hidl_vecIhEEPFiSI_PNS0_13OutputHidlVecEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS9_8hidl_vecIhEEPFiSJ_PNS0_13OutputHidlVecEE"
   },
   {
@@ -335,6 +343,10 @@
    "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIN4aidl7android8hardware8graphics6common4RectENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNSD_8hidl_vecIhEEPFiSN_PNS0_13OutputHidlVecEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8gralloc414encodeMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PNS7_8hidl_vecIhEEPFiSH_PNS0_13OutputHidlVecEE"
+  },
+  {
    "name" : "_ZN7android8gralloc415decodeBlendModeERKNS_8hardware8hidl_vecIhEEPN4aidl7android8hardware8graphics6common9BlendModeE"
   },
   {
@@ -474,18 +486,6 @@
    "name" : "_ZN7android8gralloc422decodeProtectedContentERKNS_8hardware8hidl_vecIhEEPy"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common8Cta861_3EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataIN4aidl7android8hardware8graphics6common9Smpte2086EEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNSt3__18optionalIT_EEPNS8_8hidl_vecIhEEPFiRKSI_PNS0_13OutputHidlVecEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8gralloc422encodeOptionalMetadataINSt3__16vectorIhNS2_9allocatorIhEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKNS2_8optionalIT_EEPNS7_8hidl_vecIhEEPFiRKSG_PNS0_13OutputHidlVecEE"
-  },
-  {
    "name" : "_ZN7android8gralloc422encodeProtectedContentEyPNS_8hardware8hidl_vecIhEE"
   },
   {
diff --git a/33/64/x86_x86_64/source-based/libhidlbase.so.lsdump b/33/64/x86_x86_64/source-based/libhidlbase.so.lsdump
index 152b57d..885b945 100644
--- a/33/64/x86_x86_64/source-based/libhidlbase.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libhidlbase.so.lsdump
@@ -422,10 +422,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
   },
   {
@@ -2492,7 +2488,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE8wait_popEv"
+   "name" : "_ZN7android8hardware7details17SynchronizedQueueINSt3__18functionIFvvEEEE4pushERKS6_"
   },
   {
    "binding" : "weak",
@@ -2595,10 +2591,6 @@
    "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
-  },
-  {
    "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
   },
   {
@@ -3367,10 +3359,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -3399,10 +3387,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__push_lookaheadERKS3_bj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_DUP_COUNTIPKcEET_S7_S7_Ri"
   },
   {
@@ -3423,6 +3407,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_nondupl_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__push_alternationEPNS_16__owns_one_stateIcEES6_"
   },
   {
@@ -3443,10 +3431,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE20__push_word_boundaryEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__parse_basic_reg_expIPKcEET_S7_S7_"
   },
   {
@@ -3459,11 +3443,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_RE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE23__parse_ERE_dupl_symbolIPKcEET_S7_S7_PNS_16__owns_one_stateIcEEjj"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_decimal_escapeIPKcEET_S7_S7_"
   },
   {
    "binding" : "weak",
@@ -3555,6 +3539,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3575,6 +3563,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3667,6 +3663,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEEC2EjjS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android8hardware6Parcel10BufferInfoERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android8hardware7details21ClientCounterCallback7ServiceERNS_9allocatorIS5_EEEC2EjjS8_"
   },
   {
@@ -3695,6 +3699,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8functionIFvvEEERNS_9allocatorIS3_EEEC2EjjS6_"
   },
   {
@@ -3983,10 +3991,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -4011,10 +4015,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEERKT_"
   },
   {
@@ -4059,6 +4059,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware6Parcel10BufferInfoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
@@ -4107,6 +4111,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE6assignIPS4_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS4_NS_15iterator_traitsISB_E9referenceEEE5valueEvE4typeESB_SB_"
   },
   {
@@ -4115,11 +4123,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE8__appendEj"
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEEC2ERKS7_"
+   "name" : "_ZNSt3__16vectorINS_7__stateIcEENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
   },
   {
    "binding" : "weak",
@@ -4179,10 +4191,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEjRKS4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEEC2ERKS7_"
   },
   {
@@ -4227,7 +4235,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFvRKN7android8hardware8hidl_vecINS2_11hidl_stringEEEEEC2ERKS9_"
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
   },
   {
    "binding" : "weak",
@@ -9973,19 +9981,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::ProcessState>::~sp",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEED2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware12ProcessStateEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
    "parameters" :
@@ -20981,23 +20976,6 @@
    ]
   },
   {
-   "function_name" : "android::hardware::details::StatusOf",
-   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIvEE"
-    }
-   ],
-   "return_type" : "_ZTIN7android8hardware6ReturnIbEE",
-   "source_file" : "system/libhidl/base/include/hidl/Status.h",
-   "template_args" :
-   [
-    "_ZTIv",
-    "_ZTIb"
-   ]
-  },
-  {
    "access" : "protected",
    "function_name" : "android::hardware::BHwBinder::onTransact",
    "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
@@ -24427,8 +24405,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -25778,7 +25756,7 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.Tiramisu_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.33_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
    "self_type" : "_ZTIPKN7android2spINS_8hardware7IBinder14DeathRecipientEEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
diff --git a/33/64/x86_x86_64/source-based/libldacBT_abr.so.lsdump b/33/64/x86_x86_64/source-based/libldacBT_abr.so.lsdump
index c83d20d..1f1d90a 100644
--- a/33/64/x86_x86_64/source-based/libldacBT_abr.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libldacBT_abr.so.lsdump
@@ -3,6 +3,16 @@
  "builtin_types" :
  [
   {
+   "alignment" : 1,
+   "is_integral" : true,
+   "is_unsigned" : true,
+   "linker_set_key" : "_ZTIh",
+   "name" : "unsigned char",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
+   "size" : 1
+  },
+  {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
@@ -31,6 +41,42 @@
  "elf_functions" :
  [
   {
+   "name" : "ldacBT_alter_eqmid_priority"
+  },
+  {
+   "name" : "ldacBT_close_handle"
+  },
+  {
+   "name" : "ldacBT_encode"
+  },
+  {
+   "name" : "ldacBT_free_handle"
+  },
+  {
+   "name" : "ldacBT_get_bitrate"
+  },
+  {
+   "name" : "ldacBT_get_eqmid"
+  },
+  {
+   "name" : "ldacBT_get_error_code"
+  },
+  {
+   "name" : "ldacBT_get_handle"
+  },
+  {
+   "name" : "ldacBT_get_sampling_freq"
+  },
+  {
+   "name" : "ldacBT_get_version"
+  },
+  {
+   "name" : "ldacBT_init_handle_encode"
+  },
+  {
+   "name" : "ldacBT_set_eqmid"
+  },
+  {
    "name" : "ldac_ABR_Init"
   },
   {
@@ -44,6 +90,90 @@
   },
   {
    "name" : "ldac_ABR_set_thresholds"
+  },
+  {
+   "name" : "ldaclib_check_nlnn_shift"
+  },
+  {
+   "name" : "ldaclib_clear_error_code"
+  },
+  {
+   "name" : "ldaclib_clear_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_encode"
+  },
+  {
+   "name" : "ldaclib_flush_encode"
+  },
+  {
+   "name" : "ldaclib_free_encode"
+  },
+  {
+   "name" : "ldaclib_free_handle"
+  },
+  {
+   "name" : "ldaclib_get_branch_version"
+  },
+  {
+   "name" : "ldaclib_get_channel"
+  },
+  {
+   "name" : "ldaclib_get_channel_config_index"
+  },
+  {
+   "name" : "ldaclib_get_config_info"
+  },
+  {
+   "name" : "ldaclib_get_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_get_encode_setting"
+  },
+  {
+   "name" : "ldaclib_get_error_code"
+  },
+  {
+   "name" : "ldaclib_get_frame_samples"
+  },
+  {
+   "name" : "ldaclib_get_handle"
+  },
+  {
+   "name" : "ldaclib_get_internal_error_code"
+  },
+  {
+   "name" : "ldaclib_get_major_version"
+  },
+  {
+   "name" : "ldaclib_get_minor_version"
+  },
+  {
+   "name" : "ldaclib_get_nlnn"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate"
+  },
+  {
+   "name" : "ldaclib_get_sampling_rate_index"
+  },
+  {
+   "name" : "ldaclib_get_version"
+  },
+  {
+   "name" : "ldaclib_init_encode"
+  },
+  {
+   "name" : "ldaclib_set_config_info"
+  },
+  {
+   "name" : "ldaclib_set_encode_frame_length"
+  },
+  {
+   "name" : "ldaclib_set_encode_info"
+  },
+  {
+   "name" : "ldaclib_set_frame_header"
   }
  ],
  "elf_objects" : [],
diff --git a/33/64/x86_x86_64/source-based/libmedia_omx.so.lsdump b/33/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
index 0ed1222..6662433 100644
--- a/33/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
@@ -34176,7 +34176,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -34231,13 +34231,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libmedia/libmedia_omx/android_vendor.33_x86_x86_64_shared/obj/frameworks/av/media/libmedia/omx/1.0/WOmxBufferSource.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/x86_x86_64/source-based/libnl.so.lsdump b/33/64/x86_x86_64/source-based/libnl.so.lsdump
index 1be8940..20693c6 100644
--- a/33/64/x86_x86_64/source-based/libnl.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libnl.so.lsdump
@@ -4193,7 +4193,7 @@
      "referenced_type" : "_ZTIP7nl_sock"
     },
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4217,7 +4217,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4229,7 +4229,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
@@ -4277,7 +4277,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.Tiramisu_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
+     "referenced_type" : "_ZTIP8genl_ops#ODR:out/soong/.intermediates/external/libnl/libnl/android_vendor.33_x86_x86_64_static/obj/external/libnl/lib/genl/ctrl.sdump"
     }
    ],
    "return_type" : "_ZTIi",
diff --git a/33/64/x86_x86_64/source-based/libprocessgroup.so.lsdump b/33/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
index d1a1362..6e13100 100644
--- a/33/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
@@ -133,6 +133,12 @@
    "name" : "_Z25setProcessGroupSwappinessjii"
   },
   {
+   "name" : "_Z27removeAllEmptyProcessGroupsv"
+  },
+  {
+   "name" : "_Z30removeAllProcessGroupsInternalb"
+  },
+  {
    "name" : "_Z31DropTaskProfilesResourceCachingv"
   },
   {
diff --git a/33/64/x86_x86_64/source-based/libssl.so.lsdump b/33/64/x86_x86_64/source-based/libssl.so.lsdump
index 0502d83..b30c1de 100644
--- a/33/64/x86_x86_64/source-based/libssl.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libssl.so.lsdump
@@ -891,6 +891,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8101,6 +8104,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14808,15 +14826,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19320,7 +19329,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24689,20 +24698,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump b/33/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
index 2da068b..ca801bf 100644
--- a/33/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
@@ -10602,7 +10602,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -23816,7 +23816,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -23858,13 +23858,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.Tiramisu_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.33_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/33/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump b/33/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
index aa6d8bf..7c1f56d 100644
--- a/33/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
@@ -20949,7 +20949,7 @@
    "referenced_type" : "_ZTIKN7android7String8E",
    "self_type" : "_ZTIPKN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -22182,7 +22182,7 @@
    "referenced_type" : "_ZTIN7android7String8E",
    "self_type" : "_ZTIPN7android7String8E",
    "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/String8.h"
+   "source_file" : "system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
@@ -38466,7 +38466,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE13_ListIteratorIS1_NS2_18NON_CONST_ITERATOREEE",
@@ -38521,13 +38521,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.Tiramisu_x86_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7String8EE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.33_x86_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/Omx.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7String8EE5_NodeE",
diff --git a/33/64/x86_x86_64/source-based/libui.so.lsdump b/33/64/x86_x86_64/source-based/libui.so.lsdump
index 2dc921a..aabd231 100644
--- a/33/64/x86_x86_64/source-based/libui.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libui.so.lsdump
@@ -1230,10 +1230,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -2405,10 +2401,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeISC_PvEEEE"
   },
   {
@@ -2425,10 +2417,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -2485,6 +2473,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEE9push_backEOS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -2533,10 +2525,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
@@ -2681,18 +2669,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
   },
   {
@@ -16524,12 +16500,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
diff --git a/33/64/x86_x86_64/source-based/libunwindstack.so.lsdump b/33/64/x86_x86_64/source-based/libunwindstack.so.lsdump
index 4a67a83..e4ad0aa 100644
--- a/33/64/x86_x86_64/source-based/libunwindstack.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libunwindstack.so.lsdump
@@ -3329,7 +3329,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
-   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:45:1)",
+   "name" : "unwindstack::(unnamed enum at system/unwinding/libunwindstack/include/unwindstack/ElfInterface.h:44:1)",
    "referenced_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "self_type" : "_ZTIN11unwindstack15$SONAME_INVALIDE",
    "size" : 1,
diff --git a/33/64/x86_x86_64/source-based/libutils.so.lsdump b/33/64/x86_x86_64/source-based/libutils.so.lsdump
index 4def9e1..89d91ce 100644
--- a/33/64/x86_x86_64/source-based/libutils.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libutils.so.lsdump
@@ -1225,6 +1225,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {